OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
62 #include "chrome/browser/platform_util.h" | 62 #include "chrome/browser/platform_util.h" |
63 #include "chrome/browser/prefs/active_profile_pref_service.h" | 63 #include "chrome/browser/prefs/active_profile_pref_service.h" |
64 #include "chrome/browser/prerender/prerender_final_status.h" | 64 #include "chrome/browser/prerender/prerender_final_status.h" |
65 #include "chrome/browser/prerender/prerender_manager.h" | 65 #include "chrome/browser/prerender/prerender_manager.h" |
66 #include "chrome/browser/prerender/prerender_manager_factory.h" | 66 #include "chrome/browser/prerender/prerender_manager_factory.h" |
67 #include "chrome/browser/prerender/prerender_message_filter.h" | 67 #include "chrome/browser/prerender/prerender_message_filter.h" |
68 #include "chrome/browser/printing/printing_message_filter.h" | 68 #include "chrome/browser/printing/printing_message_filter.h" |
69 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" | 69 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" |
70 #include "chrome/browser/profiles/profile.h" | 70 #include "chrome/browser/profiles/profile.h" |
71 #include "chrome/browser/profiles/profile_io_data.h" | 71 #include "chrome/browser/profiles/profile_io_data.h" |
| 72 #include "chrome/browser/profiling_host/profiling_process_host.h" |
72 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" | 73 #include "chrome/browser/renderer_host/chrome_navigation_ui_data.h" |
73 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 74 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
74 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 75 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
75 #include "chrome/browser/safe_browsing/browser_url_loader_throttle.h" | 76 #include "chrome/browser/safe_browsing/browser_url_loader_throttle.h" |
76 #include "chrome/browser/safe_browsing/certificate_reporting_service.h" | 77 #include "chrome/browser/safe_browsing/certificate_reporting_service.h" |
77 #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" | 78 #include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h" |
78 #include "chrome/browser/safe_browsing/mojo_safe_browsing_impl.h" | 79 #include "chrome/browser/safe_browsing/mojo_safe_browsing_impl.h" |
79 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 80 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
80 #include "chrome/browser/search/instant_service.h" | 81 #include "chrome/browser/search/instant_service.h" |
81 #include "chrome/browser/search/instant_service_factory.h" | 82 #include "chrome/browser/search/instant_service_factory.h" |
(...skipping 1551 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1633 | 1634 |
1634 static const char* const kCommonSwitchNames[] = { | 1635 static const char* const kCommonSwitchNames[] = { |
1635 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) | 1636 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) |
1636 switches::kMemlogPipe, | 1637 switches::kMemlogPipe, |
1637 #endif | 1638 #endif |
1638 switches::kUserAgent, | 1639 switches::kUserAgent, |
1639 switches::kUserDataDir, // Make logs go to the right file. | 1640 switches::kUserDataDir, // Make logs go to the right file. |
1640 }; | 1641 }; |
1641 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, | 1642 command_line->CopySwitchesFrom(browser_command_line, kCommonSwitchNames, |
1642 arraysize(kCommonSwitchNames)); | 1643 arraysize(kCommonSwitchNames)); |
| 1644 #if BUILDFLAG(ENABLE_OOP_HEAP_PROFILING) |
| 1645 profiling::ProfilingProcessHost::AddSwitchesToChildCmdLine(command_line); |
| 1646 #endif |
1643 | 1647 |
1644 static const char* const kDinosaurEasterEggSwitches[] = { | 1648 static const char* const kDinosaurEasterEggSwitches[] = { |
1645 error_page::switches::kDisableDinosaurEasterEgg, | 1649 error_page::switches::kDisableDinosaurEasterEgg, |
1646 }; | 1650 }; |
1647 command_line->CopySwitchesFrom(browser_command_line, | 1651 command_line->CopySwitchesFrom(browser_command_line, |
1648 kDinosaurEasterEggSwitches, | 1652 kDinosaurEasterEggSwitches, |
1649 arraysize(kDinosaurEasterEggSwitches)); | 1653 arraysize(kDinosaurEasterEggSwitches)); |
1650 | 1654 |
1651 #if defined(OS_CHROMEOS) | 1655 #if defined(OS_CHROMEOS) |
1652 // On Chrome OS need to pass primary user homedir (in multi-profiles session). | 1656 // On Chrome OS need to pass primary user homedir (in multi-profiles session). |
(...skipping 1813 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3466 // displayed URL when rewriting chrome://help to chrome://settings/help. | 3470 // displayed URL when rewriting chrome://help to chrome://settings/help. |
3467 return url->SchemeIs(content::kChromeUIScheme) && | 3471 return url->SchemeIs(content::kChromeUIScheme) && |
3468 url->host() == chrome::kChromeUISettingsHost; | 3472 url->host() == chrome::kChromeUISettingsHost; |
3469 } | 3473 } |
3470 | 3474 |
3471 // static | 3475 // static |
3472 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3476 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
3473 const storage::QuotaSettings* settings) { | 3477 const storage::QuotaSettings* settings) { |
3474 g_default_quota_settings = settings; | 3478 g_default_quota_settings = settings; |
3475 } | 3479 } |
OLD | NEW |