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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 #include "chrome/browser/lifetime/application_lifetime.h" | 46 #include "chrome/browser/lifetime/application_lifetime.h" |
47 #include "chrome/browser/metrics/metrics_service.h" | 47 #include "chrome/browser/metrics/metrics_service.h" |
48 #include "chrome/browser/metrics/thread_watcher.h" | 48 #include "chrome/browser/metrics/thread_watcher.h" |
49 #include "chrome/browser/metrics/variations/variations_service.h" | 49 #include "chrome/browser/metrics/variations/variations_service.h" |
50 #include "chrome/browser/net/chrome_net_log.h" | 50 #include "chrome/browser/net/chrome_net_log.h" |
51 #include "chrome/browser/net/crl_set_fetcher.h" | 51 #include "chrome/browser/net/crl_set_fetcher.h" |
52 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 52 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
53 #include "chrome/browser/notifications/notification_ui_manager.h" | 53 #include "chrome/browser/notifications/notification_ui_manager.h" |
54 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" | 54 #include "chrome/browser/plugins/chrome_plugin_service_filter.h" |
55 #include "chrome/browser/plugins/plugin_finder.h" | 55 #include "chrome/browser/plugins/plugin_finder.h" |
56 #include "chrome/browser/policy/policy_service.h" | |
57 #include "chrome/browser/prefs/browser_prefs.h" | 56 #include "chrome/browser/prefs/browser_prefs.h" |
58 #include "chrome/browser/prefs/chrome_pref_service_factory.h" | 57 #include "chrome/browser/prefs/chrome_pref_service_factory.h" |
59 #include "chrome/browser/prerender/prerender_tracker.h" | 58 #include "chrome/browser/prerender/prerender_tracker.h" |
60 #include "chrome/browser/printing/background_printing_manager.h" | 59 #include "chrome/browser/printing/background_printing_manager.h" |
61 #include "chrome/browser/printing/print_job_manager.h" | 60 #include "chrome/browser/printing/print_job_manager.h" |
62 #include "chrome/browser/printing/print_preview_dialog_controller.h" | 61 #include "chrome/browser/printing/print_preview_dialog_controller.h" |
63 #include "chrome/browser/profiles/profile_manager.h" | 62 #include "chrome/browser/profiles/profile_manager.h" |
64 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" | 63 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.
h" |
65 #include "chrome/browser/safe_browsing/safe_browsing_service.h" | 64 #include "chrome/browser/safe_browsing/safe_browsing_service.h" |
66 #include "chrome/browser/shell_integration.h" | 65 #include "chrome/browser/shell_integration.h" |
67 #include "chrome/browser/status_icons/status_tray.h" | 66 #include "chrome/browser/status_icons/status_tray.h" |
68 #include "chrome/browser/storage_monitor/storage_monitor.h" | 67 #include "chrome/browser/storage_monitor/storage_monitor.h" |
69 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" | 68 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h" |
70 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" | 69 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" |
71 #include "chrome/browser/ui/browser_finder.h" | 70 #include "chrome/browser/ui/browser_finder.h" |
72 #include "chrome/browser/web_resource/promo_resource_service.h" | 71 #include "chrome/browser/web_resource/promo_resource_service.h" |
73 #include "chrome/common/chrome_constants.h" | 72 #include "chrome/common/chrome_constants.h" |
74 #include "chrome/common/chrome_paths.h" | 73 #include "chrome/common/chrome_paths.h" |
75 #include "chrome/common/chrome_switches.h" | 74 #include "chrome/common/chrome_switches.h" |
76 #include "chrome/common/extensions/chrome_extensions_client.h" | 75 #include "chrome/common/extensions/chrome_extensions_client.h" |
77 #include "chrome/common/extensions/extension_l10n_util.h" | 76 #include "chrome/common/extensions/extension_l10n_util.h" |
78 #include "chrome/common/pref_names.h" | 77 #include "chrome/common/pref_names.h" |
79 #include "chrome/common/switch_utils.h" | 78 #include "chrome/common/switch_utils.h" |
80 #include "chrome/common/url_constants.h" | 79 #include "chrome/common/url_constants.h" |
81 #include "chrome/installer/util/google_update_constants.h" | 80 #include "chrome/installer/util/google_update_constants.h" |
| 81 #include "components/policy/core/common/policy_service.h" |
82 #include "content/public/browser/browser_thread.h" | 82 #include "content/public/browser/browser_thread.h" |
83 #include "content/public/browser/child_process_security_policy.h" | 83 #include "content/public/browser/child_process_security_policy.h" |
84 #include "content/public/browser/notification_details.h" | 84 #include "content/public/browser/notification_details.h" |
85 #include "content/public/browser/plugin_service.h" | 85 #include "content/public/browser/plugin_service.h" |
86 #include "content/public/browser/render_process_host.h" | 86 #include "content/public/browser/render_process_host.h" |
87 #include "content/public/browser/resource_dispatcher_host.h" | 87 #include "content/public/browser/resource_dispatcher_host.h" |
88 #include "extensions/common/constants.h" | 88 #include "extensions/common/constants.h" |
89 #include "net/socket/client_socket_pool_manager.h" | 89 #include "net/socket/client_socket_pool_manager.h" |
90 #include "net/url_request/url_request_context_getter.h" | 90 #include "net/url_request/url_request_context_getter.h" |
91 #include "ui/base/l10n/l10n_util.h" | 91 #include "ui/base/l10n/l10n_util.h" |
92 #include "ui/message_center/message_center.h" | 92 #include "ui/message_center/message_center.h" |
93 | 93 |
94 #if defined(ENABLE_CONFIGURATION_POLICY) | 94 #if defined(ENABLE_CONFIGURATION_POLICY) |
95 #include "chrome/browser/policy/browser_policy_connector.h" | 95 #include "chrome/browser/policy/browser_policy_connector.h" |
96 #else | 96 #else |
97 #include "chrome/browser/policy/policy_service_stub.h" | 97 #include "components/policy/core/common/policy_service_stub.h" |
98 #endif // defined(ENABLE_CONFIGURATION_POLICY) | 98 #endif // defined(ENABLE_CONFIGURATION_POLICY) |
99 | 99 |
100 #if defined(OS_WIN) | 100 #if defined(OS_WIN) |
101 #include "base/win/windows_version.h" | 101 #include "base/win/windows_version.h" |
102 #include "ui/views/focus/view_storage.h" | 102 #include "ui/views/focus/view_storage.h" |
103 #elif defined(OS_MACOSX) | 103 #elif defined(OS_MACOSX) |
104 #include "chrome/browser/chrome_browser_main_mac.h" | 104 #include "chrome/browser/chrome_browser_main_mac.h" |
105 #endif | 105 #endif |
106 | 106 |
107 #if defined(USE_AURA) | 107 #if defined(USE_AURA) |
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1102 } | 1102 } |
1103 | 1103 |
1104 void BrowserProcessImpl::OnAutoupdateTimer() { | 1104 void BrowserProcessImpl::OnAutoupdateTimer() { |
1105 if (CanAutorestartForUpdate()) { | 1105 if (CanAutorestartForUpdate()) { |
1106 DLOG(WARNING) << "Detected update. Restarting browser."; | 1106 DLOG(WARNING) << "Detected update. Restarting browser."; |
1107 RestartBackgroundInstance(); | 1107 RestartBackgroundInstance(); |
1108 } | 1108 } |
1109 } | 1109 } |
1110 | 1110 |
1111 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1111 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |