Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 1376783004: Android: Mark more classes as non-mobile. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 18 matching lines...) Expand all
29 #include "chrome/browser/chrome_browser_main.h" 29 #include "chrome/browser/chrome_browser_main.h"
30 #include "chrome/browser/chrome_child_process_watcher.h" 30 #include "chrome/browser/chrome_child_process_watcher.h"
31 #include "chrome/browser/chrome_content_browser_client.h" 31 #include "chrome/browser/chrome_content_browser_client.h"
32 #include "chrome/browser/chrome_notification_types.h" 32 #include "chrome/browser/chrome_notification_types.h"
33 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h" 33 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h"
34 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 34 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
35 #include "chrome/browser/defaults.h" 35 #include "chrome/browser/defaults.h"
36 #include "chrome/browser/devtools/remote_debugging_server.h" 36 #include "chrome/browser/devtools/remote_debugging_server.h"
37 #include "chrome/browser/download/download_request_limiter.h" 37 #include "chrome/browser/download/download_request_limiter.h"
38 #include "chrome/browser/download/download_status_updater.h" 38 #include "chrome/browser/download/download_status_updater.h"
39 #include "chrome/browser/first_run/upgrade_util.h"
40 #include "chrome/browser/gpu/gl_string_manager.h" 39 #include "chrome/browser/gpu/gl_string_manager.h"
41 #include "chrome/browser/gpu/gpu_mode_manager.h" 40 #include "chrome/browser/gpu/gpu_mode_manager.h"
42 #include "chrome/browser/icon_manager.h" 41 #include "chrome/browser/icon_manager.h"
43 #include "chrome/browser/intranet_redirect_detector.h" 42 #include "chrome/browser/intranet_redirect_detector.h"
44 #include "chrome/browser/io_thread.h" 43 #include "chrome/browser/io_thread.h"
45 #include "chrome/browser/lifetime/application_lifetime.h" 44 #include "chrome/browser/lifetime/application_lifetime.h"
46 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" 45 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
47 #include "chrome/browser/metrics/metrics_services_manager.h" 46 #include "chrome/browser/metrics/metrics_services_manager.h"
48 #include "chrome/browser/metrics/thread_watcher.h" 47 #include "chrome/browser/metrics/thread_watcher.h"
49 #include "chrome/browser/net/chrome_net_log_helper.h" 48 #include "chrome/browser/net/chrome_net_log_helper.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 #endif 143 #endif
145 144
146 #if defined(ENABLE_WEBRTC) 145 #if defined(ENABLE_WEBRTC)
147 #include "chrome/browser/media/webrtc_log_uploader.h" 146 #include "chrome/browser/media/webrtc_log_uploader.h"
148 #endif 147 #endif
149 148
150 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS) 149 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
151 #include "chrome/browser/memory/tab_manager.h" 150 #include "chrome/browser/memory/tab_manager.h"
152 #endif 151 #endif
153 152
153 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
154 #include "chrome/browser/first_run/upgrade_util.h"
155 #endif
156
154 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 157 #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
155 // How often to check if the persistent instance of Chrome needs to restart 158 // How often to check if the persistent instance of Chrome needs to restart
156 // to install an update. 159 // to install an update.
157 static const int kUpdateCheckIntervalHours = 6; 160 static const int kUpdateCheckIntervalHours = 6;
158 #endif 161 #endif
159 162
160 #if defined(USE_X11) || defined(OS_WIN) || defined(USE_OZONE) 163 #if defined(USE_X11) || defined(OS_WIN) || defined(USE_OZONE)
161 // How long to wait for the File thread to complete during EndSession, on Linux 164 // How long to wait for the File thread to complete during EndSession, on Linux
162 // and Windows. We have a timeout here because we're unable to run the UI 165 // and Windows. We have a timeout here because we're unable to run the UI
163 // messageloop and there's some deadlock risk. Our only option is to exit 166 // messageloop and there's some deadlock risk. Our only option is to exit
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1275 } 1278 }
1276 1279
1277 void BrowserProcessImpl::OnAutoupdateTimer() { 1280 void BrowserProcessImpl::OnAutoupdateTimer() {
1278 if (CanAutorestartForUpdate()) { 1281 if (CanAutorestartForUpdate()) {
1279 DLOG(WARNING) << "Detected update. Restarting browser."; 1282 DLOG(WARNING) << "Detected update. Restarting browser.";
1280 RestartBackgroundInstance(); 1283 RestartBackgroundInstance();
1281 } 1284 }
1282 } 1285 }
1283 1286
1284 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1287 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/browser_shutdown.cc » ('j') | chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698