OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 18 matching lines...) Expand all Loading... |
29 #include "chrome/browser/extensions/extension_tab_id_map.h" | 29 #include "chrome/browser/extensions/extension_tab_id_map.h" |
30 #include "chrome/browser/extensions/user_script_listener.h" | 30 #include "chrome/browser/extensions/user_script_listener.h" |
31 #include "chrome/browser/first_run/upgrade_util.h" | 31 #include "chrome/browser/first_run/upgrade_util.h" |
32 #include "chrome/browser/google/google_url_tracker.h" | 32 #include "chrome/browser/google/google_url_tracker.h" |
33 #include "chrome/browser/icon_manager.h" | 33 #include "chrome/browser/icon_manager.h" |
34 #include "chrome/browser/intranet_redirect_detector.h" | 34 #include "chrome/browser/intranet_redirect_detector.h" |
35 #include "chrome/browser/io_thread.h" | 35 #include "chrome/browser/io_thread.h" |
36 #include "chrome/browser/metrics/metrics_service.h" | 36 #include "chrome/browser/metrics/metrics_service.h" |
37 #include "chrome/browser/metrics/thread_watcher.h" | 37 #include "chrome/browser/metrics/thread_watcher.h" |
38 #include "chrome/browser/net/chrome_net_log.h" | 38 #include "chrome/browser/net/chrome_net_log.h" |
| 39 #include "chrome/browser/net/predictor_api.h" |
39 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 40 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
40 #include "chrome/browser/notifications/notification_ui_manager.h" | 41 #include "chrome/browser/notifications/notification_ui_manager.h" |
41 #include "chrome/browser/policy/browser_policy_connector.h" | 42 #include "chrome/browser/policy/browser_policy_connector.h" |
42 #include "chrome/browser/prefs/browser_prefs.h" | 43 #include "chrome/browser/prefs/browser_prefs.h" |
43 #include "chrome/browser/prefs/pref_service.h" | 44 #include "chrome/browser/prefs/pref_service.h" |
44 #include "chrome/browser/prerender/prerender_tracker.h" | 45 #include "chrome/browser/prerender/prerender_tracker.h" |
45 #include "chrome/browser/printing/background_printing_manager.h" | 46 #include "chrome/browser/printing/background_printing_manager.h" |
46 #include "chrome/browser/printing/print_job_manager.h" | 47 #include "chrome/browser/printing/print_job_manager.h" |
47 #include "chrome/browser/printing/print_preview_tab_controller.h" | 48 #include "chrome/browser/printing/print_preview_tab_controller.h" |
48 #include "chrome/browser/profiles/profile_manager.h" | 49 #include "chrome/browser/profiles/profile_manager.h" |
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1125 } | 1126 } |
1126 | 1127 |
1127 void BrowserProcessImpl::OnAutoupdateTimer() { | 1128 void BrowserProcessImpl::OnAutoupdateTimer() { |
1128 if (CanAutorestartForUpdate()) { | 1129 if (CanAutorestartForUpdate()) { |
1129 DLOG(WARNING) << "Detected update. Restarting browser."; | 1130 DLOG(WARNING) << "Detected update. Restarting browser."; |
1130 RestartPersistentInstance(); | 1131 RestartPersistentInstance(); |
1131 } | 1132 } |
1132 } | 1133 } |
1133 | 1134 |
1134 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1135 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |