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

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

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/browser_process_impl_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <stddef.h>
8
7 #include <algorithm> 9 #include <algorithm>
8 #include <map> 10 #include <map>
9 #include <vector> 11 #include <vector>
10 12
11 #include "base/atomic_ref_count.h" 13 #include "base/atomic_ref_count.h"
12 #include "base/bind.h" 14 #include "base/bind.h"
13 #include "base/bind_helpers.h" 15 #include "base/bind_helpers.h"
14 #include "base/command_line.h" 16 #include "base/command_line.h"
15 #include "base/debug/alias.h" 17 #include "base/debug/alias.h"
16 #include "base/debug/leak_annotations.h" 18 #include "base/debug/leak_annotations.h"
17 #include "base/files/file_path.h" 19 #include "base/files/file_path.h"
20 #include "base/macros.h"
18 #include "base/metrics/field_trial.h" 21 #include "base/metrics/field_trial.h"
19 #include "base/metrics/histogram_macros.h" 22 #include "base/metrics/histogram_macros.h"
20 #include "base/path_service.h" 23 #include "base/path_service.h"
21 #include "base/prefs/json_pref_store.h" 24 #include "base/prefs/json_pref_store.h"
22 #include "base/prefs/pref_registry_simple.h" 25 #include "base/prefs/pref_registry_simple.h"
23 #include "base/prefs/pref_service.h" 26 #include "base/prefs/pref_service.h"
24 #include "base/synchronization/waitable_event.h" 27 #include "base/synchronization/waitable_event.h"
25 #include "base/threading/thread.h" 28 #include "base/threading/thread.h"
26 #include "base/threading/thread_restrictions.h" 29 #include "base/threading/thread_restrictions.h"
27 #include "base/time/default_tick_clock.h" 30 #include "base/time/default_tick_clock.h"
28 #include "base/trace_event/trace_event.h" 31 #include "base/trace_event/trace_event.h"
32 #include "build/build_config.h"
29 #include "chrome/browser/chrome_browser_main.h" 33 #include "chrome/browser/chrome_browser_main.h"
30 #include "chrome/browser/chrome_child_process_watcher.h" 34 #include "chrome/browser/chrome_child_process_watcher.h"
31 #include "chrome/browser/chrome_content_browser_client.h" 35 #include "chrome/browser/chrome_content_browser_client.h"
32 #include "chrome/browser/chrome_device_client.h" 36 #include "chrome/browser/chrome_device_client.h"
33 #include "chrome/browser/chrome_notification_types.h" 37 #include "chrome/browser/chrome_notification_types.h"
34 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h" 38 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h"
35 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h " 39 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h "
36 #include "chrome/browser/defaults.h" 40 #include "chrome/browser/defaults.h"
37 #include "chrome/browser/devtools/remote_debugging_server.h" 41 #include "chrome/browser/devtools/remote_debugging_server.h"
38 #include "chrome/browser/download/download_request_limiter.h" 42 #include "chrome/browser/download/download_request_limiter.h"
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 GpuModeManager* BrowserProcessImpl::gpu_mode_manager() { 670 GpuModeManager* BrowserProcessImpl::gpu_mode_manager() {
667 DCHECK(CalledOnValidThread()); 671 DCHECK(CalledOnValidThread());
668 if (!gpu_mode_manager_.get()) 672 if (!gpu_mode_manager_.get())
669 gpu_mode_manager_.reset(new GpuModeManager()); 673 gpu_mode_manager_.reset(new GpuModeManager());
670 return gpu_mode_manager_.get(); 674 return gpu_mode_manager_.get();
671 } 675 }
672 676
673 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( 677 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler(
674 chrome::HostDesktopType host_desktop_type, 678 chrome::HostDesktopType host_desktop_type,
675 const std::string& ip, 679 const std::string& ip,
676 uint16 port) { 680 uint16_t port) {
677 DCHECK(CalledOnValidThread()); 681 DCHECK(CalledOnValidThread());
678 #if !defined(OS_ANDROID) 682 #if !defined(OS_ANDROID)
679 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser 683 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser
680 // is started with several profiles or existing browser process is reused. 684 // is started with several profiles or existing browser process is reused.
681 if (!remote_debugging_server_.get()) { 685 if (!remote_debugging_server_.get()) {
682 remote_debugging_server_.reset( 686 remote_debugging_server_.reset(
683 new RemoteDebuggingServer(host_desktop_type, ip, port)); 687 new RemoteDebuggingServer(host_desktop_type, ip, port));
684 } 688 }
685 #endif 689 #endif
686 } 690 }
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
1286 } 1290 }
1287 1291
1288 void BrowserProcessImpl::OnAutoupdateTimer() { 1292 void BrowserProcessImpl::OnAutoupdateTimer() {
1289 if (CanAutorestartForUpdate()) { 1293 if (CanAutorestartForUpdate()) {
1290 DLOG(WARNING) << "Detected update. Restarting browser."; 1294 DLOG(WARNING) << "Detected update. Restarting browser.";
1291 RestartBackgroundInstance(); 1295 RestartBackgroundInstance();
1292 } 1296 }
1293 } 1297 }
1294 1298
1295 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1299 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/browser_process_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698