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 <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "chrome/common/chrome_notification_types.h" | 59 #include "chrome/common/chrome_notification_types.h" |
60 #include "chrome/common/chrome_paths.h" | 60 #include "chrome/common/chrome_paths.h" |
61 #include "chrome/common/chrome_switches.h" | 61 #include "chrome/common/chrome_switches.h" |
62 #include "chrome/common/extensions/extension_l10n_util.h" | 62 #include "chrome/common/extensions/extension_l10n_util.h" |
63 #include "chrome/common/extensions/extension_resource.h" | 63 #include "chrome/common/extensions/extension_resource.h" |
64 #include "chrome/common/json_pref_store.h" | 64 #include "chrome/common/json_pref_store.h" |
65 #include "chrome/common/pref_names.h" | 65 #include "chrome/common/pref_names.h" |
66 #include "chrome/common/switch_utils.h" | 66 #include "chrome/common/switch_utils.h" |
67 #include "chrome/common/url_constants.h" | 67 #include "chrome/common/url_constants.h" |
68 #include "chrome/installer/util/google_update_constants.h" | 68 #include "chrome/installer/util/google_update_constants.h" |
69 #include "content/browser/browser_child_process_host.h" | |
70 #include "content/browser/child_process_security_policy.h" | 69 #include "content/browser/child_process_security_policy.h" |
71 #include "content/browser/download/download_status_updater.h" | 70 #include "content/browser/download/download_status_updater.h" |
72 #include "content/browser/download/mhtml_generation_manager.h" | 71 #include "content/browser/download/mhtml_generation_manager.h" |
73 #include "content/browser/gpu/gpu_process_host_ui_shim.h" | 72 #include "content/browser/gpu/gpu_process_host_ui_shim.h" |
74 #include "content/browser/net/browser_online_state_observer.h" | 73 #include "content/browser/net/browser_online_state_observer.h" |
75 #include "content/browser/renderer_host/resource_dispatcher_host.h" | 74 #include "content/browser/renderer_host/resource_dispatcher_host.h" |
76 #include "content/public/browser/browser_thread.h" | 75 #include "content/public/browser/browser_thread.h" |
77 #include "content/public/browser/notification_details.h" | 76 #include "content/public/browser/notification_details.h" |
78 #include "content/public/browser/plugin_service.h" | 77 #include "content/public/browser/plugin_service.h" |
79 #include "content/public/browser/render_process_host.h" | 78 #include "content/public/browser/render_process_host.h" |
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
883 } | 882 } |
884 | 883 |
885 void BrowserProcessImpl::OnAutoupdateTimer() { | 884 void BrowserProcessImpl::OnAutoupdateTimer() { |
886 if (CanAutorestartForUpdate()) { | 885 if (CanAutorestartForUpdate()) { |
887 DLOG(WARNING) << "Detected update. Restarting browser."; | 886 DLOG(WARNING) << "Detected update. Restarting browser."; |
888 RestartBackgroundInstance(); | 887 RestartBackgroundInstance(); |
889 } | 888 } |
890 } | 889 } |
891 | 890 |
892 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 891 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |