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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <map> | 10 #include <map> |
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
205 created_local_state_(false), | 205 created_local_state_(false), |
206 created_icon_manager_(false), | 206 created_icon_manager_(false), |
207 created_notification_ui_manager_(false), | 207 created_notification_ui_manager_(false), |
208 created_notification_bridge_(false), | 208 created_notification_bridge_(false), |
209 created_safe_browsing_service_(false), | 209 created_safe_browsing_service_(false), |
210 created_subresource_filter_ruleset_service_(false), | 210 created_subresource_filter_ruleset_service_(false), |
211 shutting_down_(false), | 211 shutting_down_(false), |
212 tearing_down_(false), | 212 tearing_down_(false), |
213 download_status_updater_(new DownloadStatusUpdater), | 213 download_status_updater_(new DownloadStatusUpdater), |
214 local_state_task_runner_(local_state_task_runner), | 214 local_state_task_runner_(local_state_task_runner), |
215 #if defined(OS_CHROMEOS) | |
216 memory_kills_monitor_handle_( | |
217 memory::MemoryKillsMonitor::StartMonitoring()), | |
218 #endif // !defined(OS_ANDROID) | |
sky
2016/11/26 16:49:40
ANDROID->CHROMEOS
cylee1
2016/11/29 20:28:40
Done.
| |
215 cached_default_web_client_state_(shell_integration::UNKNOWN_DEFAULT) { | 219 cached_default_web_client_state_(shell_integration::UNKNOWN_DEFAULT) { |
216 g_browser_process = this; | 220 g_browser_process = this; |
217 platform_part_.reset(new BrowserProcessPlatformPart()); | 221 platform_part_.reset(new BrowserProcessPlatformPart()); |
218 | 222 |
219 #if BUILDFLAG(ENABLE_PRINTING) | 223 #if BUILDFLAG(ENABLE_PRINTING) |
220 // Must be created after the NotificationService. | 224 // Must be created after the NotificationService. |
221 print_job_manager_.reset(new printing::PrintJobManager); | 225 print_job_manager_.reset(new printing::PrintJobManager); |
222 #endif | 226 #endif |
223 | 227 |
224 base::FilePath net_log_path; | 228 base::FilePath net_log_path; |
(...skipping 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1400 } | 1404 } |
1401 | 1405 |
1402 void BrowserProcessImpl::OnAutoupdateTimer() { | 1406 void BrowserProcessImpl::OnAutoupdateTimer() { |
1403 if (CanAutorestartForUpdate()) { | 1407 if (CanAutorestartForUpdate()) { |
1404 DLOG(WARNING) << "Detected update. Restarting browser."; | 1408 DLOG(WARNING) << "Detected update. Restarting browser."; |
1405 RestartBackgroundInstance(); | 1409 RestartBackgroundInstance(); |
1406 } | 1410 } |
1407 } | 1411 } |
1408 | 1412 |
1409 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1413 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |