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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 #include "chrome/browser/shell_integration.h" | 64 #include "chrome/browser/shell_integration.h" |
65 #include "chrome/browser/status_icons/status_tray.h" | 65 #include "chrome/browser/status_icons/status_tray.h" |
66 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" | 66 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h" |
67 #include "chrome/browser/ui/browser_dialogs.h" | 67 #include "chrome/browser/ui/browser_dialogs.h" |
68 #include "chrome/browser/ui/browser_finder.h" | 68 #include "chrome/browser/ui/browser_finder.h" |
69 #include "chrome/browser/web_resource/promo_resource_service.h" | 69 #include "chrome/browser/web_resource/promo_resource_service.h" |
70 #include "chrome/common/chrome_constants.h" | 70 #include "chrome/common/chrome_constants.h" |
71 #include "chrome/common/chrome_paths.h" | 71 #include "chrome/common/chrome_paths.h" |
72 #include "chrome/common/chrome_switches.h" | 72 #include "chrome/common/chrome_switches.h" |
73 #include "chrome/common/extensions/chrome_extensions_client.h" | 73 #include "chrome/common/extensions/chrome_extensions_client.h" |
74 #include "chrome/common/extensions/extension_l10n_util.h" | |
75 #include "chrome/common/pref_names.h" | 74 #include "chrome/common/pref_names.h" |
76 #include "chrome/common/profile_management_switches.h" | 75 #include "chrome/common/profile_management_switches.h" |
77 #include "chrome/common/switch_utils.h" | 76 #include "chrome/common/switch_utils.h" |
78 #include "chrome/common/url_constants.h" | 77 #include "chrome/common/url_constants.h" |
79 #include "chrome/installer/util/google_update_constants.h" | 78 #include "chrome/installer/util/google_update_constants.h" |
80 #include "components/policy/core/common/policy_service.h" | 79 #include "components/policy/core/common/policy_service.h" |
81 #include "components/rappor/rappor_service.h" | 80 #include "components/rappor/rappor_service.h" |
82 #include "components/translate/core/browser/translate_download_manager.h" | 81 #include "components/translate/core/browser/translate_download_manager.h" |
83 #include "content/public/browser/browser_thread.h" | 82 #include "content/public/browser/browser_thread.h" |
84 #include "content/public/browser/child_process_security_policy.h" | 83 #include "content/public/browser/child_process_security_policy.h" |
85 #include "content/public/browser/notification_details.h" | 84 #include "content/public/browser/notification_details.h" |
86 #include "content/public/browser/plugin_service.h" | 85 #include "content/public/browser/plugin_service.h" |
87 #include "content/public/browser/render_process_host.h" | 86 #include "content/public/browser/render_process_host.h" |
88 #include "content/public/browser/resource_dispatcher_host.h" | 87 #include "content/public/browser/resource_dispatcher_host.h" |
89 #include "extensions/common/constants.h" | 88 #include "extensions/common/constants.h" |
| 89 #include "extensions/common/extension_l10n_util.h" |
90 #include "net/socket/client_socket_pool_manager.h" | 90 #include "net/socket/client_socket_pool_manager.h" |
91 #include "net/url_request/url_request_context_getter.h" | 91 #include "net/url_request/url_request_context_getter.h" |
92 #include "ui/base/l10n/l10n_util.h" | 92 #include "ui/base/l10n/l10n_util.h" |
93 #include "ui/message_center/message_center.h" | 93 #include "ui/message_center/message_center.h" |
94 | 94 |
95 #if defined(ENABLE_CONFIGURATION_POLICY) | 95 #if defined(ENABLE_CONFIGURATION_POLICY) |
96 #include "components/policy/core/browser/browser_policy_connector.h" | 96 #include "components/policy/core/browser/browser_policy_connector.h" |
97 #else | 97 #else |
98 #include "components/policy/core/common/policy_service_stub.h" | 98 #include "components/policy/core/common/policy_service_stub.h" |
99 #endif // defined(ENABLE_CONFIGURATION_POLICY) | 99 #endif // defined(ENABLE_CONFIGURATION_POLICY) |
(...skipping 968 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1068 } | 1068 } |
1069 | 1069 |
1070 void BrowserProcessImpl::OnAutoupdateTimer() { | 1070 void BrowserProcessImpl::OnAutoupdateTimer() { |
1071 if (CanAutorestartForUpdate()) { | 1071 if (CanAutorestartForUpdate()) { |
1072 DLOG(WARNING) << "Detected update. Restarting browser."; | 1072 DLOG(WARNING) << "Detected update. Restarting browser."; |
1073 RestartBackgroundInstance(); | 1073 RestartBackgroundInstance(); |
1074 } | 1074 } |
1075 } | 1075 } |
1076 | 1076 |
1077 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1077 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |