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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 53 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
54 #include "chrome/browser/prerender/prerender_tracker.h" | 54 #include "chrome/browser/prerender/prerender_tracker.h" |
55 #include "chrome/browser/printing/background_printing_manager.h" | 55 #include "chrome/browser/printing/background_printing_manager.h" |
56 #include "chrome/browser/printing/print_job_manager.h" | 56 #include "chrome/browser/printing/print_job_manager.h" |
57 #include "chrome/browser/printing/print_preview_dialog_controller.h" | 57 #include "chrome/browser/printing/print_preview_dialog_controller.h" |
58 #include "chrome/browser/profiles/profile_manager.h" | 58 #include "chrome/browser/profiles/profile_manager.h" |
59 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" | 59 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" |
60 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 60 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
61 #include "chrome/browser/shell_integration.h" | 61 #include "chrome/browser/shell_integration.h" |
62 #include "chrome/browser/status_icons/status_tray.h" | 62 #include "chrome/browser/status_icons/status_tray.h" |
63 #include "chrome/browser/ui/apps/chrome_apps_client.h" | 63 #include "chrome/browser/ui/apps/chrome_app_window_client.h" |
64 #include "chrome/browser/ui/browser_dialogs.h" | 64 #include "chrome/browser/ui/browser_dialogs.h" |
65 #include "chrome/browser/ui/browser_finder.h" | 65 #include "chrome/browser/ui/browser_finder.h" |
66 #include "chrome/browser/web_resource/promo_resource_service.h" | 66 #include "chrome/browser/web_resource/promo_resource_service.h" |
67 #include "chrome/common/chrome_constants.h" | 67 #include "chrome/common/chrome_constants.h" |
68 #include "chrome/common/chrome_paths.h" | 68 #include "chrome/common/chrome_paths.h" |
69 #include "chrome/common/chrome_switches.h" | 69 #include "chrome/common/chrome_switches.h" |
70 #include "chrome/common/extensions/chrome_extensions_client.h" | 70 #include "chrome/common/extensions/chrome_extensions_client.h" |
71 #include "chrome/common/pref_names.h" | 71 #include "chrome/common/pref_names.h" |
72 #include "chrome/common/switch_utils.h" | 72 #include "chrome/common/switch_utils.h" |
73 #include "chrome/common/url_constants.h" | 73 #include "chrome/common/url_constants.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
195 InitIdleMonitor(); | 195 InitIdleMonitor(); |
196 #endif | 196 #endif |
197 | 197 |
198 #if !defined(OS_ANDROID) | 198 #if !defined(OS_ANDROID) |
199 device_client_.reset(new ChromeDeviceClient); | 199 device_client_.reset(new ChromeDeviceClient); |
200 #endif | 200 #endif |
201 | 201 |
202 #if defined(ENABLE_EXTENSIONS) | 202 #if defined(ENABLE_EXTENSIONS) |
203 #if !defined(USE_ATHENA) | 203 #if !defined(USE_ATHENA) |
204 // Athena sets its own instance during Athena's init process. | 204 // Athena sets its own instance during Athena's init process. |
205 extensions::AppsClient::Set(ChromeAppsClient::GetInstance()); | 205 extensions::AppWindowClient::Set(ChromeAppWindowClient::GetInstance()); |
206 #endif | 206 #endif |
207 | 207 |
208 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; | 208 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; |
209 ExtensionRendererState::GetInstance()->Init(); | 209 ExtensionRendererState::GetInstance()->Init(); |
210 | 210 |
211 extensions::ExtensionsClient::Set( | 211 extensions::ExtensionsClient::Set( |
212 extensions::ChromeExtensionsClient::GetInstance()); | 212 extensions::ChromeExtensionsClient::GetInstance()); |
213 | 213 |
214 extensions_browser_client_.reset( | 214 extensions_browser_client_.reset( |
215 new extensions::ChromeExtensionsBrowserClient); | 215 new extensions::ChromeExtensionsBrowserClient); |
(...skipping 1002 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1218 } | 1218 } |
1219 | 1219 |
1220 void BrowserProcessImpl::OnAutoupdateTimer() { | 1220 void BrowserProcessImpl::OnAutoupdateTimer() { |
1221 if (CanAutorestartForUpdate()) { | 1221 if (CanAutorestartForUpdate()) { |
1222 DLOG(WARNING) << "Detected update. Restarting browser."; | 1222 DLOG(WARNING) << "Detected update. Restarting browser."; |
1223 RestartBackgroundInstance(); | 1223 RestartBackgroundInstance(); |
1224 } | 1224 } |
1225 } | 1225 } |
1226 | 1226 |
1227 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1227 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |