| 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 25 matching lines...) Expand all Loading... |
| 36 #include "chrome/browser/devtools/remote_debugging_server.h" | 36 #include "chrome/browser/devtools/remote_debugging_server.h" |
| 37 #include "chrome/browser/download/download_request_limiter.h" | 37 #include "chrome/browser/download/download_request_limiter.h" |
| 38 #include "chrome/browser/download/download_status_updater.h" | 38 #include "chrome/browser/download/download_status_updater.h" |
| 39 #include "chrome/browser/first_run/upgrade_util.h" | 39 #include "chrome/browser/first_run/upgrade_util.h" |
| 40 #include "chrome/browser/gpu/gl_string_manager.h" | 40 #include "chrome/browser/gpu/gl_string_manager.h" |
| 41 #include "chrome/browser/gpu/gpu_mode_manager.h" | 41 #include "chrome/browser/gpu/gpu_mode_manager.h" |
| 42 #include "chrome/browser/icon_manager.h" | 42 #include "chrome/browser/icon_manager.h" |
| 43 #include "chrome/browser/intranet_redirect_detector.h" | 43 #include "chrome/browser/intranet_redirect_detector.h" |
| 44 #include "chrome/browser/io_thread.h" | 44 #include "chrome/browser/io_thread.h" |
| 45 #include "chrome/browser/lifetime/application_lifetime.h" | 45 #include "chrome/browser/lifetime/application_lifetime.h" |
| 46 #include "chrome/browser/lifetime/browser_keep_alive.h" |
| 46 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" | 47 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" |
| 47 #include "chrome/browser/metrics/metrics_services_manager.h" | 48 #include "chrome/browser/metrics/metrics_services_manager.h" |
| 48 #include "chrome/browser/metrics/thread_watcher.h" | 49 #include "chrome/browser/metrics/thread_watcher.h" |
| 49 #include "chrome/browser/net/chrome_net_log_helper.h" | 50 #include "chrome/browser/net/chrome_net_log_helper.h" |
| 50 #include "chrome/browser/net/crl_set_fetcher.h" | 51 #include "chrome/browser/net/crl_set_fetcher.h" |
| 51 #include "chrome/browser/notifications/notification_ui_manager.h" | 52 #include "chrome/browser/notifications/notification_ui_manager.h" |
| 52 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" | 53 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" |
| 53 #include "chrome/browser/plugins/plugin_finder.h" | 54 #include "chrome/browser/plugins/plugin_finder.h" |
| 54 #include "chrome/browser/prefs/browser_prefs.h" | 55 #include "chrome/browser/prefs/browser_prefs.h" |
| 55 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 56 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
| (...skipping 1166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1222 cached_default_web_client_state_ = ShellIntegration::GetDefaultBrowser(); | 1223 cached_default_web_client_state_ = ShellIntegration::GetDefaultBrowser(); |
| 1223 #endif | 1224 #endif |
| 1224 } | 1225 } |
| 1225 | 1226 |
| 1226 // Mac is currently not supported. | 1227 // Mac is currently not supported. |
| 1227 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1228 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| 1228 | 1229 |
| 1229 bool BrowserProcessImpl::CanAutorestartForUpdate() const { | 1230 bool BrowserProcessImpl::CanAutorestartForUpdate() const { |
| 1230 // Check if browser is in the background and if it needs to be restarted to | 1231 // Check if browser is in the background and if it needs to be restarted to |
| 1231 // apply a pending update. | 1232 // apply a pending update. |
| 1232 return chrome::GetTotalBrowserCount() == 0 && chrome::WillKeepAlive() && | 1233 return chrome::GetTotalBrowserCount() == 0 && |
| 1234 browser_lifetime::WillKeepAlive() && |
| 1233 upgrade_util::IsUpdatePendingRestart(); | 1235 upgrade_util::IsUpdatePendingRestart(); |
| 1234 } | 1236 } |
| 1235 | 1237 |
| 1236 // Switches to add when auto-restarting Chrome. | 1238 // Switches to add when auto-restarting Chrome. |
| 1237 const char* const kSwitchesToAddOnAutorestart[] = { | 1239 const char* const kSwitchesToAddOnAutorestart[] = { |
| 1238 switches::kNoStartupWindow | 1240 switches::kNoStartupWindow |
| 1239 }; | 1241 }; |
| 1240 | 1242 |
| 1241 void BrowserProcessImpl::RestartBackgroundInstance() { | 1243 void BrowserProcessImpl::RestartBackgroundInstance() { |
| 1242 base::CommandLine* old_cl = base::CommandLine::ForCurrentProcess(); | 1244 base::CommandLine* old_cl = base::CommandLine::ForCurrentProcess(); |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1275 } | 1277 } |
| 1276 | 1278 |
| 1277 void BrowserProcessImpl::OnAutoupdateTimer() { | 1279 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1278 if (CanAutorestartForUpdate()) { | 1280 if (CanAutorestartForUpdate()) { |
| 1279 DLOG(WARNING) << "Detected update. Restarting browser."; | 1281 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1280 RestartBackgroundInstance(); | 1282 RestartBackgroundInstance(); |
| 1281 } | 1283 } |
| 1282 } | 1284 } |
| 1283 | 1285 |
| 1284 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1286 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |