| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <map> | 10 #include <map> |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 #include "ui/message_center/message_center.h" | 131 #include "ui/message_center/message_center.h" |
| 132 | 132 |
| 133 #if defined(OS_WIN) | 133 #if defined(OS_WIN) |
| 134 #include "base/win/windows_version.h" | 134 #include "base/win/windows_version.h" |
| 135 #include "ui/views/focus/view_storage.h" | 135 #include "ui/views/focus/view_storage.h" |
| 136 #elif defined(OS_MACOSX) | 136 #elif defined(OS_MACOSX) |
| 137 #include "chrome/browser/chrome_browser_main_mac.h" | 137 #include "chrome/browser/chrome_browser_main_mac.h" |
| 138 #endif | 138 #endif |
| 139 | 139 |
| 140 #if !defined(OS_ANDROID) | 140 #if !defined(OS_ANDROID) |
| 141 #include "chrome/browser/gcm/gcm_product_util.h" |
| 141 #include "chrome/browser/lifetime/keep_alive_registry.h" | 142 #include "chrome/browser/lifetime/keep_alive_registry.h" |
| 142 #include "chrome/browser/services/gcm/gcm_product_util.h" | |
| 143 #include "chrome/browser/ui/user_manager.h" | 143 #include "chrome/browser/ui/user_manager.h" |
| 144 #include "components/gcm_driver/gcm_client_factory.h" | 144 #include "components/gcm_driver/gcm_client_factory.h" |
| 145 #include "components/gcm_driver/gcm_desktop_utils.h" | 145 #include "components/gcm_driver/gcm_desktop_utils.h" |
| 146 #endif | 146 #endif |
| 147 | 147 |
| 148 #if BUILDFLAG(ENABLE_BACKGROUND) | 148 #if BUILDFLAG(ENABLE_BACKGROUND) |
| 149 #include "chrome/browser/background/background_mode_manager.h" | 149 #include "chrome/browser/background/background_mode_manager.h" |
| 150 #endif | 150 #endif |
| 151 | 151 |
| 152 #if BUILDFLAG(ENABLE_EXTENSIONS) | 152 #if BUILDFLAG(ENABLE_EXTENSIONS) |
| (...skipping 1259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1412 } | 1412 } |
| 1413 | 1413 |
| 1414 void BrowserProcessImpl::OnAutoupdateTimer() { | 1414 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 1415 if (CanAutorestartForUpdate()) { | 1415 if (CanAutorestartForUpdate()) { |
| 1416 DLOG(WARNING) << "Detected update. Restarting browser."; | 1416 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 1417 RestartBackgroundInstance(); | 1417 RestartBackgroundInstance(); |
| 1418 } | 1418 } |
| 1419 } | 1419 } |
| 1420 | 1420 |
| 1421 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1421 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |