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 638 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
649 GpuModeManager* BrowserProcessImpl::gpu_mode_manager() { | 649 GpuModeManager* BrowserProcessImpl::gpu_mode_manager() { |
650 DCHECK(CalledOnValidThread()); | 650 DCHECK(CalledOnValidThread()); |
651 if (!gpu_mode_manager_.get()) | 651 if (!gpu_mode_manager_.get()) |
652 gpu_mode_manager_.reset(new GpuModeManager()); | 652 gpu_mode_manager_.reset(new GpuModeManager()); |
653 return gpu_mode_manager_.get(); | 653 return gpu_mode_manager_.get(); |
654 } | 654 } |
655 | 655 |
656 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( | 656 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( |
657 chrome::HostDesktopType host_desktop_type, | 657 chrome::HostDesktopType host_desktop_type, |
658 const std::string& ip, | 658 const std::string& ip, |
659 int port) { | 659 uint16 port) { |
660 DCHECK(CalledOnValidThread()); | 660 DCHECK(CalledOnValidThread()); |
661 #if !defined(OS_ANDROID) | 661 #if !defined(OS_ANDROID) |
662 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser | 662 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser |
663 // is started with several profiles or existing browser process is reused. | 663 // is started with several profiles or existing browser process is reused. |
664 if (!remote_debugging_server_.get()) { | 664 if (!remote_debugging_server_.get()) { |
665 remote_debugging_server_.reset( | 665 remote_debugging_server_.reset( |
666 new RemoteDebuggingServer(host_desktop_type, ip, port)); | 666 new RemoteDebuggingServer(host_desktop_type, ip, port)); |
667 } | 667 } |
668 #endif | 668 #endif |
669 } | 669 } |
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1217 } | 1217 } |
1218 | 1218 |
1219 void BrowserProcessImpl::OnAutoupdateTimer() { | 1219 void BrowserProcessImpl::OnAutoupdateTimer() { |
1220 if (CanAutorestartForUpdate()) { | 1220 if (CanAutorestartForUpdate()) { |
1221 DLOG(WARNING) << "Detected update. Restarting browser."; | 1221 DLOG(WARNING) << "Detected update. Restarting browser."; |
1222 RestartBackgroundInstance(); | 1222 RestartBackgroundInstance(); |
1223 } | 1223 } |
1224 } | 1224 } |
1225 | 1225 |
1226 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1226 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |