| 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/browser_process_impl.h" | 5 #include "chrome/browser/browser_process_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 #include "chrome/browser/chrome_browser_main.h" | 27 #include "chrome/browser/chrome_browser_main.h" |
| 28 #include "chrome/browser/chrome_content_browser_client.h" | 28 #include "chrome/browser/chrome_content_browser_client.h" |
| 29 #include "chrome/browser/chrome_notification_types.h" | 29 #include "chrome/browser/chrome_notification_types.h" |
| 30 #include "chrome/browser/component_updater/component_updater_configurator.h" | 30 #include "chrome/browser/component_updater/component_updater_configurator.h" |
| 31 #include "chrome/browser/component_updater/component_updater_service.h" | 31 #include "chrome/browser/component_updater/component_updater_service.h" |
| 32 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 32 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
| 33 #include "chrome/browser/defaults.h" | 33 #include "chrome/browser/defaults.h" |
| 34 #include "chrome/browser/devtools/remote_debugging_server.h" | 34 #include "chrome/browser/devtools/remote_debugging_server.h" |
| 35 #include "chrome/browser/download/download_request_limiter.h" | 35 #include "chrome/browser/download/download_request_limiter.h" |
| 36 #include "chrome/browser/download/download_status_updater.h" | 36 #include "chrome/browser/download/download_status_updater.h" |
| 37 #include "chrome/browser/extensions/chrome_extensions_browser_client.h" | |
| 38 #include "chrome/browser/extensions/event_router_forwarder.h" | 37 #include "chrome/browser/extensions/event_router_forwarder.h" |
| 39 #include "chrome/browser/extensions/extension_renderer_state.h" | 38 #include "chrome/browser/extensions/extension_renderer_state.h" |
| 40 #include "chrome/browser/first_run/upgrade_util.h" | 39 #include "chrome/browser/first_run/upgrade_util.h" |
| 41 #include "chrome/browser/gpu/gl_string_manager.h" | 40 #include "chrome/browser/gpu/gl_string_manager.h" |
| 42 #include "chrome/browser/gpu/gpu_mode_manager.h" | 41 #include "chrome/browser/gpu/gpu_mode_manager.h" |
| 43 #include "chrome/browser/icon_manager.h" | 42 #include "chrome/browser/icon_manager.h" |
| 44 #include "chrome/browser/idle.h" | 43 #include "chrome/browser/idle.h" |
| 45 #include "chrome/browser/intranet_redirect_detector.h" | 44 #include "chrome/browser/intranet_redirect_detector.h" |
| 46 #include "chrome/browser/io_thread.h" | 45 #include "chrome/browser/io_thread.h" |
| 47 #include "chrome/browser/lifetime/application_lifetime.h" | 46 #include "chrome/browser/lifetime/application_lifetime.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 62 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" | 61 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" |
| 63 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 62 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
| 64 #include "chrome/browser/shell_integration.h" | 63 #include "chrome/browser/shell_integration.h" |
| 65 #include "chrome/browser/status_icons/status_tray.h" | 64 #include "chrome/browser/status_icons/status_tray.h" |
| 66 #include "chrome/browser/ui/browser_dialogs.h" | 65 #include "chrome/browser/ui/browser_dialogs.h" |
| 67 #include "chrome/browser/ui/browser_finder.h" | 66 #include "chrome/browser/ui/browser_finder.h" |
| 68 #include "chrome/browser/web_resource/promo_resource_service.h" | 67 #include "chrome/browser/web_resource/promo_resource_service.h" |
| 69 #include "chrome/common/chrome_constants.h" | 68 #include "chrome/common/chrome_constants.h" |
| 70 #include "chrome/common/chrome_paths.h" | 69 #include "chrome/common/chrome_paths.h" |
| 71 #include "chrome/common/chrome_switches.h" | 70 #include "chrome/common/chrome_switches.h" |
| 72 #include "chrome/common/extensions/chrome_extensions_client.h" | |
| 73 #include "chrome/common/pref_names.h" | 71 #include "chrome/common/pref_names.h" |
| 74 #include "chrome/common/switch_utils.h" | 72 #include "chrome/common/switch_utils.h" |
| 75 #include "chrome/common/url_constants.h" | 73 #include "chrome/common/url_constants.h" |
| 76 #include "chrome/installer/util/google_update_constants.h" | 74 #include "chrome/installer/util/google_update_constants.h" |
| 77 #include "chrome/installer/util/google_update_settings.h" | 75 #include "chrome/installer/util/google_update_settings.h" |
| 78 #include "components/gcm_driver/gcm_driver.h" | 76 #include "components/gcm_driver/gcm_driver.h" |
| 79 #include "components/metrics/metrics_service.h" | 77 #include "components/metrics/metrics_service.h" |
| 80 #include "components/network_time/network_time_tracker.h" | 78 #include "components/network_time/network_time_tracker.h" |
| 81 #include "components/policy/core/common/policy_service.h" | 79 #include "components/policy/core/common/policy_service.h" |
| 82 #include "components/signin/core/common/profile_management_switches.h" | 80 #include "components/signin/core/common/profile_management_switches.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 #if defined(USE_AURA) | 116 #if defined(USE_AURA) |
| 119 #include "ui/aura/env.h" | 117 #include "ui/aura/env.h" |
| 120 #endif | 118 #endif |
| 121 | 119 |
| 122 #if defined(ENABLE_CONFIGURATION_POLICY) | 120 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 123 #include "components/policy/core/browser/browser_policy_connector.h" | 121 #include "components/policy/core/browser/browser_policy_connector.h" |
| 124 #else | 122 #else |
| 125 #include "components/policy/core/common/policy_service_stub.h" | 123 #include "components/policy/core/common/policy_service_stub.h" |
| 126 #endif // defined(ENABLE_CONFIGURATION_POLICY) | 124 #endif // defined(ENABLE_CONFIGURATION_POLICY) |
| 127 | 125 |
| 126 #if defined(ENABLE_EXTENSIONS) |
| 127 #include "chrome/browser/extensions/chrome_extensions_browser_client.h" |
| 128 #include "chrome/common/extensions/chrome_extensions_client.h" |
| 129 #endif |
| 130 |
| 128 #if defined(ENABLE_PLUGIN_INSTALLATION) | 131 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 129 #include "chrome/browser/plugins/plugins_resource_service.h" | 132 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 130 #endif | 133 #endif |
| 131 | 134 |
| 132 #if defined(ENABLE_WEBRTC) | 135 #if defined(ENABLE_WEBRTC) |
| 133 #include "chrome/browser/media/webrtc_log_uploader.h" | 136 #include "chrome/browser/media/webrtc_log_uploader.h" |
| 134 #endif | 137 #endif |
| 135 | 138 |
| 136 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 139 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| 137 // How often to check if the persistent instance of Chrome needs to restart | 140 // How often to check if the persistent instance of Chrome needs to restart |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 extensions::kExtensionResourceScheme); | 185 extensions::kExtensionResourceScheme); |
| 183 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 186 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 184 chrome::kChromeSearchScheme); | 187 chrome::kChromeSearchScheme); |
| 185 | 188 |
| 186 #if defined(OS_MACOSX) | 189 #if defined(OS_MACOSX) |
| 187 InitIdleMonitor(); | 190 InitIdleMonitor(); |
| 188 #endif | 191 #endif |
| 189 | 192 |
| 190 #if defined(ENABLE_EXTENSIONS) | 193 #if defined(ENABLE_EXTENSIONS) |
| 191 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); | 194 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); |
| 192 #endif | |
| 193 | |
| 194 extensions::ExtensionsClient::Set( | |
| 195 extensions::ChromeExtensionsClient::GetInstance()); | |
| 196 | |
| 197 extensions_browser_client_.reset( | 195 extensions_browser_client_.reset( |
| 198 new extensions::ChromeExtensionsBrowserClient); | 196 new extensions::ChromeExtensionsBrowserClient); |
| 199 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); | 197 extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get()); |
| 198 extensions::ExtensionsClient::Set( |
| 199 extensions::ChromeExtensionsClient::GetInstance()); |
| 200 #endif |
| 200 | 201 |
| 201 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; | 202 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; |
| 202 ExtensionRendererState::GetInstance()->Init(); | 203 ExtensionRendererState::GetInstance()->Init(); |
| 203 | 204 |
| 204 message_center::MessageCenter::Initialize(); | 205 message_center::MessageCenter::Initialize(); |
| 205 } | 206 } |
| 206 | 207 |
| 207 BrowserProcessImpl::~BrowserProcessImpl() { | 208 BrowserProcessImpl::~BrowserProcessImpl() { |
| 208 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); | 209 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); |
| 209 | 210 |
| (...skipping 891 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 } | 1102 } |
| 1102 | 1103 |
| 1103 void BrowserProcessImpl::OnAutoupdateTimer() { | 1104 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1104 if (CanAutorestartForUpdate()) { | 1105 if (CanAutorestartForUpdate()) { |
| 1105 DLOG(WARNING) << "Detected update. Restarting browser."; | 1106 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1106 RestartBackgroundInstance(); | 1107 RestartBackgroundInstance(); |
| 1107 } | 1108 } |
| 1108 } | 1109 } |
| 1109 | 1110 |
| 1110 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1111 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |