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 <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/bind_helpers.h" | 13 #include "base/bind_helpers.h" |
14 #include "base/command_line.h" | 14 #include "base/command_line.h" |
15 #include "base/debug/alias.h" | 15 #include "base/debug/alias.h" |
16 #include "base/file_util.h" | 16 #include "base/file_util.h" |
17 #include "base/path_service.h" | 17 #include "base/path_service.h" |
| 18 #include "base/prefs/json_pref_store.h" |
18 #include "base/synchronization/waitable_event.h" | 19 #include "base/synchronization/waitable_event.h" |
19 #include "base/threading/thread.h" | 20 #include "base/threading/thread.h" |
20 #include "base/threading/thread_restrictions.h" | 21 #include "base/threading/thread_restrictions.h" |
21 #include "chrome/browser/automation/automation_provider_list.h" | 22 #include "chrome/browser/automation/automation_provider_list.h" |
22 #include "chrome/browser/background/background_mode_manager.h" | 23 #include "chrome/browser/background/background_mode_manager.h" |
23 #include "chrome/browser/chrome_browser_main.h" | 24 #include "chrome/browser/chrome_browser_main.h" |
24 #include "chrome/browser/chrome_content_browser_client.h" | 25 #include "chrome/browser/chrome_content_browser_client.h" |
25 #include "chrome/browser/chrome_plugin_service_filter.h" | 26 #include "chrome/browser/chrome_plugin_service_filter.h" |
26 #include "chrome/browser/component_updater/component_updater_configurator.h" | 27 #include "chrome/browser/component_updater/component_updater_configurator.h" |
27 #include "chrome/browser/component_updater/component_updater_service.h" | 28 #include "chrome/browser/component_updater/component_updater_service.h" |
(...skipping 29 matching lines...) Expand all Loading... |
57 #include "chrome/browser/status_icons/status_tray.h" | 58 #include "chrome/browser/status_icons/status_tray.h" |
58 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" | 59 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" |
59 #include "chrome/browser/ui/browser_list.h" | 60 #include "chrome/browser/ui/browser_list.h" |
60 #include "chrome/common/chrome_constants.h" | 61 #include "chrome/common/chrome_constants.h" |
61 #include "chrome/common/chrome_content_client.h" | 62 #include "chrome/common/chrome_content_client.h" |
62 #include "chrome/common/chrome_notification_types.h" | 63 #include "chrome/common/chrome_notification_types.h" |
63 #include "chrome/common/chrome_paths.h" | 64 #include "chrome/common/chrome_paths.h" |
64 #include "chrome/common/chrome_switches.h" | 65 #include "chrome/common/chrome_switches.h" |
65 #include "chrome/common/extensions/extension_l10n_util.h" | 66 #include "chrome/common/extensions/extension_l10n_util.h" |
66 #include "chrome/common/extensions/extension_resource.h" | 67 #include "chrome/common/extensions/extension_resource.h" |
67 #include "chrome/common/json_pref_store.h" | |
68 #include "chrome/common/pref_names.h" | 68 #include "chrome/common/pref_names.h" |
69 #include "chrome/common/switch_utils.h" | 69 #include "chrome/common/switch_utils.h" |
70 #include "chrome/common/url_constants.h" | 70 #include "chrome/common/url_constants.h" |
71 #include "chrome/installer/util/google_update_constants.h" | 71 #include "chrome/installer/util/google_update_constants.h" |
72 #include "content/public/browser/browser_thread.h" | 72 #include "content/public/browser/browser_thread.h" |
73 #include "content/public/browser/child_process_security_policy.h" | 73 #include "content/public/browser/child_process_security_policy.h" |
74 #include "content/public/browser/notification_details.h" | 74 #include "content/public/browser/notification_details.h" |
75 #include "content/public/browser/plugin_service.h" | 75 #include "content/public/browser/plugin_service.h" |
76 #include "content/public/browser/render_process_host.h" | 76 #include "content/public/browser/render_process_host.h" |
77 #include "content/public/browser/resource_dispatcher_host.h" | 77 #include "content/public/browser/resource_dispatcher_host.h" |
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
949 } | 949 } |
950 | 950 |
951 void BrowserProcessImpl::OnAutoupdateTimer() { | 951 void BrowserProcessImpl::OnAutoupdateTimer() { |
952 if (CanAutorestartForUpdate()) { | 952 if (CanAutorestartForUpdate()) { |
953 DLOG(WARNING) << "Detected update. Restarting browser."; | 953 DLOG(WARNING) << "Detected update. Restarting browser."; |
954 RestartBackgroundInstance(); | 954 RestartBackgroundInstance(); |
955 } | 955 } |
956 } | 956 } |
957 | 957 |
958 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 958 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |