| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 #if defined(OS_WIN) | 99 #if defined(OS_WIN) |
| 100 #include "base/win/windows_version.h" | 100 #include "base/win/windows_version.h" |
| 101 #include "ui/views/focus/view_storage.h" | 101 #include "ui/views/focus/view_storage.h" |
| 102 #elif defined(OS_MACOSX) | 102 #elif defined(OS_MACOSX) |
| 103 #include "chrome/browser/chrome_browser_main_mac.h" | 103 #include "chrome/browser/chrome_browser_main_mac.h" |
| 104 #endif | 104 #endif |
| 105 | 105 |
| 106 #if defined(OS_ANDROID) | 106 #if defined(OS_ANDROID) |
| 107 #include "components/gcm_driver/gcm_driver_android.h" | 107 #include "components/gcm_driver/gcm_driver_android.h" |
| 108 #else | 108 #else |
| 109 #include "chrome/browser/chrome_device_client.h" |
| 109 #include "chrome/browser/services/gcm/gcm_desktop_utils.h" | 110 #include "chrome/browser/services/gcm/gcm_desktop_utils.h" |
| 110 #include "components/gcm_driver/gcm_client_factory.h" | 111 #include "components/gcm_driver/gcm_client_factory.h" |
| 111 #endif | 112 #endif |
| 112 | 113 |
| 113 #if defined(USE_AURA) | 114 #if defined(USE_AURA) |
| 114 #include "ui/aura/env.h" | 115 #include "ui/aura/env.h" |
| 115 #endif | 116 #endif |
| 116 | 117 |
| 117 #if defined(ENABLE_CONFIGURATION_POLICY) | 118 #if defined(ENABLE_CONFIGURATION_POLICY) |
| 118 #include "components/policy/core/browser/browser_policy_connector.h" | 119 #include "components/policy/core/browser/browser_policy_connector.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 extensions::kExtensionScheme); | 188 extensions::kExtensionScheme); |
| 188 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 189 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 189 extensions::kExtensionResourceScheme); | 190 extensions::kExtensionResourceScheme); |
| 190 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 191 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 191 chrome::kChromeSearchScheme); | 192 chrome::kChromeSearchScheme); |
| 192 | 193 |
| 193 #if defined(OS_MACOSX) | 194 #if defined(OS_MACOSX) |
| 194 InitIdleMonitor(); | 195 InitIdleMonitor(); |
| 195 #endif | 196 #endif |
| 196 | 197 |
| 198 #if !defined(OS_ANDROID) |
| 199 device_client_.reset(new ChromeDeviceClient); |
| 200 #endif |
| 201 |
| 197 #if defined(ENABLE_EXTENSIONS) | 202 #if defined(ENABLE_EXTENSIONS) |
| 198 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); | 203 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); |
| 199 | 204 |
| 200 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; | 205 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; |
| 201 ExtensionRendererState::GetInstance()->Init(); | 206 ExtensionRendererState::GetInstance()->Init(); |
| 202 | 207 |
| 203 extensions::ExtensionsClient::Set( | 208 extensions::ExtensionsClient::Set( |
| 204 extensions::ChromeExtensionsClient::GetInstance()); | 209 extensions::ChromeExtensionsClient::GetInstance()); |
| 205 | 210 |
| 206 extensions_browser_client_.reset( | 211 extensions_browser_client_.reset( |
| (...skipping 1005 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1212 } | 1217 } |
| 1213 | 1218 |
| 1214 void BrowserProcessImpl::OnAutoupdateTimer() { | 1219 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1215 if (CanAutorestartForUpdate()) { | 1220 if (CanAutorestartForUpdate()) { |
| 1216 DLOG(WARNING) << "Detected update. Restarting browser."; | 1221 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1217 RestartBackgroundInstance(); | 1222 RestartBackgroundInstance(); |
| 1218 } | 1223 } |
| 1219 } | 1224 } |
| 1220 | 1225 |
| 1221 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1226 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |