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> |
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 #endif | 119 #endif |
120 | 120 |
121 using content::BrowserThread; | 121 using content::BrowserThread; |
122 using content::ChildProcessSecurityPolicy; | 122 using content::ChildProcessSecurityPolicy; |
123 using content::PluginService; | 123 using content::PluginService; |
124 using content::ResourceDispatcherHost; | 124 using content::ResourceDispatcherHost; |
125 | 125 |
126 BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line) | 126 BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line) |
127 : created_metrics_service_(false), | 127 : created_metrics_service_(false), |
128 created_watchdog_thread_(false), | 128 created_watchdog_thread_(false), |
| 129 created_browser_policy_connector_(false), |
129 created_profile_manager_(false), | 130 created_profile_manager_(false), |
130 created_local_state_(false), | 131 created_local_state_(false), |
131 created_icon_manager_(false), | 132 created_icon_manager_(false), |
132 created_browser_policy_connector_(false), | |
133 created_notification_ui_manager_(false), | 133 created_notification_ui_manager_(false), |
134 created_safe_browsing_service_(false), | 134 created_safe_browsing_service_(false), |
135 module_ref_count_(0), | 135 module_ref_count_(0), |
136 did_start_(false), | 136 did_start_(false), |
137 checked_for_new_frames_(false), | 137 checked_for_new_frames_(false), |
138 using_new_frames_(false), | 138 using_new_frames_(false), |
139 thumbnail_generator_(new ThumbnailGenerator), | 139 thumbnail_generator_(new ThumbnailGenerator), |
140 download_status_updater_(new DownloadStatusUpdater) { | 140 download_status_updater_(new DownloadStatusUpdater) { |
141 g_browser_process = this; | 141 g_browser_process = this; |
142 clipboard_.reset(new ui::Clipboard); | 142 clipboard_.reset(new ui::Clipboard); |
(...skipping 787 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
930 } | 930 } |
931 | 931 |
932 void BrowserProcessImpl::OnAutoupdateTimer() { | 932 void BrowserProcessImpl::OnAutoupdateTimer() { |
933 if (CanAutorestartForUpdate()) { | 933 if (CanAutorestartForUpdate()) { |
934 DLOG(WARNING) << "Detected update. Restarting browser."; | 934 DLOG(WARNING) << "Detected update. Restarting browser."; |
935 RestartBackgroundInstance(); | 935 RestartBackgroundInstance(); |
936 } | 936 } |
937 } | 937 } |
938 | 938 |
939 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 939 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |