| 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 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/bind_helpers.h" | 12 #include "base/bind_helpers.h" |
| 13 #include "base/command_line.h" | 13 #include "base/command_line.h" |
| 14 #include "base/debug/alias.h" | 14 #include "base/debug/alias.h" |
| 15 #include "base/path_service.h" | 15 #include "base/path_service.h" |
| 16 #include "base/prefs/json_pref_store.h" | 16 #include "base/prefs/json_pref_store.h" |
| 17 #include "base/prefs/pref_registry_simple.h" | 17 #include "base/prefs/pref_registry_simple.h" |
| 18 #include "base/prefs/pref_service.h" | 18 #include "base/prefs/pref_service.h" |
| 19 #include "base/synchronization/waitable_event.h" | 19 #include "base/synchronization/waitable_event.h" |
| 20 #include "base/threading/thread.h" | 20 #include "base/threading/thread.h" |
| 21 #include "base/threading/thread_restrictions.h" | 21 #include "base/threading/thread_restrictions.h" |
| 22 #include "chrome/browser/apps/chrome_apps_client.h" |
| 22 #include "chrome/browser/automation/automation_provider_list.h" | 23 #include "chrome/browser/automation/automation_provider_list.h" |
| 23 #include "chrome/browser/background/background_mode_manager.h" | 24 #include "chrome/browser/background/background_mode_manager.h" |
| 24 #include "chrome/browser/chrome_browser_main.h" | 25 #include "chrome/browser/chrome_browser_main.h" |
| 25 #include "chrome/browser/chrome_content_browser_client.h" | 26 #include "chrome/browser/chrome_content_browser_client.h" |
| 26 #include "chrome/browser/chrome_notification_types.h" | 27 #include "chrome/browser/chrome_notification_types.h" |
| 27 #include "chrome/browser/component_updater/component_updater_configurator.h" | 28 #include "chrome/browser/component_updater/component_updater_configurator.h" |
| 28 #include "chrome/browser/component_updater/component_updater_service.h" | 29 #include "chrome/browser/component_updater/component_updater_service.h" |
| 29 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 30 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
| 30 #include "chrome/browser/defaults.h" | 31 #include "chrome/browser/defaults.h" |
| 31 #include "chrome/browser/devtools/remote_debugging_server.h" | 32 #include "chrome/browser/devtools/remote_debugging_server.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 extensions::kExtensionScheme); | 176 extensions::kExtensionScheme); |
| 176 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 177 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 177 chrome::kExtensionResourceScheme); | 178 chrome::kExtensionResourceScheme); |
| 178 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 179 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 179 chrome::kChromeSearchScheme); | 180 chrome::kChromeSearchScheme); |
| 180 | 181 |
| 181 #if defined(OS_MACOSX) | 182 #if defined(OS_MACOSX) |
| 182 InitIdleMonitor(); | 183 InitIdleMonitor(); |
| 183 #endif | 184 #endif |
| 184 | 185 |
| 186 apps::AppsClient::Set(ChromeAppsClient::GetInstance()); |
| 185 extensions::ExtensionsClient::Set( | 187 extensions::ExtensionsClient::Set( |
| 186 extensions::ChromeExtensionsClient::GetInstance()); | 188 extensions::ChromeExtensionsClient::GetInstance()); |
| 187 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; | 189 extension_event_router_forwarder_ = new extensions::EventRouterForwarder; |
| 188 ExtensionRendererState::GetInstance()->Init(); | 190 ExtensionRendererState::GetInstance()->Init(); |
| 189 | 191 |
| 190 message_center::MessageCenter::Initialize(); | 192 message_center::MessageCenter::Initialize(); |
| 191 } | 193 } |
| 192 | 194 |
| 193 BrowserProcessImpl::~BrowserProcessImpl() { | 195 BrowserProcessImpl::~BrowserProcessImpl() { |
| 194 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); | 196 tracked_objects::ThreadData::EnsureCleanupWasCalled(4); |
| (...skipping 864 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1059 } | 1061 } |
| 1060 | 1062 |
| 1061 void BrowserProcessImpl::OnAutoupdateTimer() { | 1063 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1062 if (CanAutorestartForUpdate()) { | 1064 if (CanAutorestartForUpdate()) { |
| 1063 DLOG(WARNING) << "Detected update. Restarting browser."; | 1065 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1064 RestartBackgroundInstance(); | 1066 RestartBackgroundInstance(); |
| 1065 } | 1067 } |
| 1066 } | 1068 } |
| 1067 | 1069 |
| 1068 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1070 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |