Chromium Code Reviews| 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 #include "chrome/common/chrome_constants.h" | 66 #include "chrome/common/chrome_constants.h" |
| 67 #include "chrome/common/chrome_paths.h" | 67 #include "chrome/common/chrome_paths.h" |
| 68 #include "chrome/common/chrome_switches.h" | 68 #include "chrome/common/chrome_switches.h" |
| 69 #include "chrome/common/extensions/chrome_extensions_client.h" | 69 #include "chrome/common/extensions/chrome_extensions_client.h" |
| 70 #include "chrome/common/pref_names.h" | 70 #include "chrome/common/pref_names.h" |
| 71 #include "chrome/common/switch_utils.h" | 71 #include "chrome/common/switch_utils.h" |
| 72 #include "chrome/common/url_constants.h" | 72 #include "chrome/common/url_constants.h" |
| 73 #include "chrome/installer/util/google_update_constants.h" | 73 #include "chrome/installer/util/google_update_constants.h" |
| 74 #include "chrome/installer/util/google_update_settings.h" | 74 #include "chrome/installer/util/google_update_settings.h" |
| 75 #include "components/component_updater/component_updater_service.h" | 75 #include "components/component_updater/component_updater_service.h" |
| 76 #include "components/device_event_log/device_event_log.h" | |
| 76 #include "components/gcm_driver/gcm_driver.h" | 77 #include "components/gcm_driver/gcm_driver.h" |
| 77 #include "components/metrics/metrics_service.h" | 78 #include "components/metrics/metrics_service.h" |
| 78 #include "components/network_time/network_time_tracker.h" | 79 #include "components/network_time/network_time_tracker.h" |
| 79 #include "components/policy/core/common/policy_service.h" | 80 #include "components/policy/core/common/policy_service.h" |
| 80 #include "components/signin/core/common/profile_management_switches.h" | 81 #include "components/signin/core/common/profile_management_switches.h" |
| 81 #include "components/translate/core/browser/translate_download_manager.h" | 82 #include "components/translate/core/browser/translate_download_manager.h" |
| 82 #include "components/update_client/update_query_params.h" | 83 #include "components/update_client/update_query_params.h" |
| 83 #include "components/web_resource/web_resource_pref_names.h" | 84 #include "components/web_resource/web_resource_pref_names.h" |
| 84 #include "content/public/browser/browser_thread.h" | 85 #include "content/public/browser/browser_thread.h" |
| 85 #include "content/public/browser/child_process_security_policy.h" | 86 #include "content/public/browser/child_process_security_policy.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 179 download_status_updater_(new DownloadStatusUpdater), | 180 download_status_updater_(new DownloadStatusUpdater), |
| 180 local_state_task_runner_(local_state_task_runner) { | 181 local_state_task_runner_(local_state_task_runner) { |
| 181 g_browser_process = this; | 182 g_browser_process = this; |
| 182 platform_part_.reset(new BrowserProcessPlatformPart()); | 183 platform_part_.reset(new BrowserProcessPlatformPart()); |
| 183 | 184 |
| 184 #if defined(ENABLE_PRINTING) | 185 #if defined(ENABLE_PRINTING) |
| 185 // Must be created after the NotificationService. | 186 // Must be created after the NotificationService. |
| 186 print_job_manager_.reset(new printing::PrintJobManager); | 187 print_job_manager_.reset(new printing::PrintJobManager); |
| 187 #endif | 188 #endif |
| 188 | 189 |
| 190 device_event_log::Initialize(0 /* default max entries */); | |
|
stevenjb
2015/02/17 19:24:35
I think this would actually be better in chrome_br
Reilly Grant (use Gerrit)
2015/02/17 21:13:46
Done.
| |
| 189 net_log_.reset(new ChromeNetLog); | 191 net_log_.reset(new ChromeNetLog); |
| 190 | 192 |
| 191 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 193 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 192 extensions::kExtensionScheme); | 194 extensions::kExtensionScheme); |
| 193 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 195 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 194 extensions::kExtensionResourceScheme); | 196 extensions::kExtensionResourceScheme); |
| 195 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( | 197 ChildProcessSecurityPolicy::GetInstance()->RegisterWebSafeScheme( |
| 196 chrome::kChromeSearchScheme); | 198 chrome::kChromeSearchScheme); |
| 197 | 199 |
| 198 #if defined(OS_MACOSX) | 200 #if defined(OS_MACOSX) |
| (...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1214 } | 1216 } |
| 1215 | 1217 |
| 1216 void BrowserProcessImpl::OnAutoupdateTimer() { | 1218 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1217 if (CanAutorestartForUpdate()) { | 1219 if (CanAutorestartForUpdate()) { |
| 1218 DLOG(WARNING) << "Detected update. Restarting browser."; | 1220 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1219 RestartBackgroundInstance(); | 1221 RestartBackgroundInstance(); |
| 1220 } | 1222 } |
| 1221 } | 1223 } |
| 1222 | 1224 |
| 1223 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1225 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |