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

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

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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 633 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 } 644 }
645 645
646 GpuModeManager* BrowserProcessImpl::gpu_mode_manager() { 646 GpuModeManager* BrowserProcessImpl::gpu_mode_manager() {
647 DCHECK(CalledOnValidThread()); 647 DCHECK(CalledOnValidThread());
648 if (!gpu_mode_manager_.get()) 648 if (!gpu_mode_manager_.get())
649 gpu_mode_manager_.reset(new GpuModeManager()); 649 gpu_mode_manager_.reset(new GpuModeManager());
650 return gpu_mode_manager_.get(); 650 return gpu_mode_manager_.get();
651 } 651 }
652 652
653 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( 653 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler(
654 chrome::HostDesktopType host_desktop_type, 654 ui::HostDesktopType host_desktop_type,
655 const std::string& ip, 655 const std::string& ip,
656 uint16 port) { 656 uint16 port) {
657 DCHECK(CalledOnValidThread()); 657 DCHECK(CalledOnValidThread());
658 #if !defined(OS_ANDROID) 658 #if !defined(OS_ANDROID)
659 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser 659 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser
660 // is started with several profiles or existing browser process is reused. 660 // is started with several profiles or existing browser process is reused.
661 if (!remote_debugging_server_.get()) { 661 if (!remote_debugging_server_.get()) {
662 remote_debugging_server_.reset( 662 remote_debugging_server_.reset(
663 new RemoteDebuggingServer(host_desktop_type, ip, port)); 663 new RemoteDebuggingServer(host_desktop_type, ip, port));
664 } 664 }
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after
1256 } 1256 }
1257 1257
1258 void BrowserProcessImpl::OnAutoupdateTimer() { 1258 void BrowserProcessImpl::OnAutoupdateTimer() {
1259 if (CanAutorestartForUpdate()) { 1259 if (CanAutorestartForUpdate()) {
1260 DLOG(WARNING) << "Detected update. Restarting browser."; 1260 DLOG(WARNING) << "Detected update. Restarting browser.";
1261 RestartBackgroundInstance(); 1261 RestartBackgroundInstance();
1262 } 1262 }
1263 } 1263 }
1264 1264
1265 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1265 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698