| 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 <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/bind_helpers.h" | 13 #include "base/bind_helpers.h" |
| 14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
| 15 #include "base/debug/alias.h" | 15 #include "base/debug/alias.h" |
| 16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
| 17 #include "base/prefs/json_pref_store.h" | 17 #include "base/prefs/json_pref_store.h" |
| 18 #include "base/prefs/pref_registry_simple.h" | 18 #include "base/prefs/pref_registry_simple.h" |
| 19 #include "base/prefs/pref_service.h" | 19 #include "base/prefs/pref_service.h" |
| 20 #include "base/synchronization/waitable_event.h" | 20 #include "base/synchronization/waitable_event.h" |
| 21 #include "base/threading/thread.h" | 21 #include "base/threading/thread.h" |
| 22 #include "base/threading/thread_restrictions.h" | 22 #include "base/threading/thread_restrictions.h" |
| 23 #include "chrome/browser/automation/automation_provider_list.h" | 23 #include "chrome/browser/automation/automation_provider_list.h" |
| 24 #include "chrome/browser/background/background_mode_manager.h" | 24 #include "chrome/browser/background/background_mode_manager.h" |
| 25 #include "chrome/browser/browser_process_platform_part.h" |
| 25 #include "chrome/browser/chrome_browser_main.h" | 26 #include "chrome/browser/chrome_browser_main.h" |
| 26 #include "chrome/browser/chrome_content_browser_client.h" | 27 #include "chrome/browser/chrome_content_browser_client.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" |
| 32 #include "chrome/browser/download/download_request_limiter.h" | 33 #include "chrome/browser/download/download_request_limiter.h" |
| 33 #include "chrome/browser/download/download_status_updater.h" | 34 #include "chrome/browser/download/download_status_updater.h" |
| 34 #include "chrome/browser/extensions/event_router_forwarder.h" | 35 #include "chrome/browser/extensions/event_router_forwarder.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 #include "base/win/windows_version.h" | 101 #include "base/win/windows_version.h" |
| 101 #include "ui/views/focus/view_storage.h" | 102 #include "ui/views/focus/view_storage.h" |
| 102 #elif defined(OS_MACOSX) | 103 #elif defined(OS_MACOSX) |
| 103 #include "chrome/browser/chrome_browser_main_mac.h" | 104 #include "chrome/browser/chrome_browser_main_mac.h" |
| 104 #endif | 105 #endif |
| 105 | 106 |
| 106 #if defined(USE_AURA) | 107 #if defined(USE_AURA) |
| 107 #include "ui/aura/env.h" | 108 #include "ui/aura/env.h" |
| 108 #endif | 109 #endif |
| 109 | 110 |
| 110 #if defined(OS_CHROMEOS) | |
| 111 #include "chrome/browser/browser_process_platform_part_chromeos.h" | |
| 112 #elif defined(OS_WIN) && defined(USE_AURA) | |
| 113 #include "chrome/browser/browser_process_platform_part_aurawin.h" | |
| 114 #else | |
| 115 #include "chrome/browser/browser_process_platform_part.h" | |
| 116 #endif // defined(OS_CHROMEOS) | |
| 117 | |
| 118 #if !defined(OS_ANDROID) | 111 #if !defined(OS_ANDROID) |
| 119 #include "chrome/browser/media_galleries/media_file_system_registry.h" | 112 #include "chrome/browser/media_galleries/media_file_system_registry.h" |
| 120 #endif | 113 #endif |
| 121 | 114 |
| 122 #if defined(ENABLE_PLUGIN_INSTALLATION) | 115 #if defined(ENABLE_PLUGIN_INSTALLATION) |
| 123 #include "chrome/browser/plugins/plugins_resource_service.h" | 116 #include "chrome/browser/plugins/plugins_resource_service.h" |
| 124 #endif | 117 #endif |
| 125 | 118 |
| 126 #if defined(OS_MACOSX) | 119 #if defined(OS_MACOSX) |
| 127 #include "apps/app_shim/app_shim_host_manager_mac.h" | 120 #include "apps/app_shim/app_shim_host_manager_mac.h" |
| (...skipping 923 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1051 } | 1044 } |
| 1052 | 1045 |
| 1053 void BrowserProcessImpl::OnAutoupdateTimer() { | 1046 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1054 if (CanAutorestartForUpdate()) { | 1047 if (CanAutorestartForUpdate()) { |
| 1055 DLOG(WARNING) << "Detected update. Restarting browser."; | 1048 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1056 RestartBackgroundInstance(); | 1049 RestartBackgroundInstance(); |
| 1057 } | 1050 } |
| 1058 } | 1051 } |
| 1059 | 1052 |
| 1060 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1053 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |