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

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

Issue 12328029: Plumb HostDesktopType through BrowserListTabContentsProvider. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chrome_browser_main.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 <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 if (automation_provider_list_.get() == NULL) 521 if (automation_provider_list_.get() == NULL)
522 automation_provider_list_.reset(new AutomationProviderList()); 522 automation_provider_list_.reset(new AutomationProviderList());
523 return automation_provider_list_.get(); 523 return automation_provider_list_.get();
524 #else 524 #else
525 return NULL; 525 return NULL;
526 #endif 526 #endif
527 } 527 }
528 528
529 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( 529 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler(
530 Profile* profile, 530 Profile* profile,
531 chrome::HostDesktopType host_desktop_type,
531 const std::string& ip, 532 const std::string& ip,
532 int port, 533 int port,
533 const std::string& frontend_url) { 534 const std::string& frontend_url) {
534 DCHECK(CalledOnValidThread()); 535 DCHECK(CalledOnValidThread());
535 #if !defined(OS_ANDROID) 536 #if !defined(OS_ANDROID)
536 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser 537 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser
537 // is started with several profiles or existing browser process is reused. 538 // is started with several profiles or existing browser process is reused.
538 if (!remote_debugging_server_.get()) { 539 if (!remote_debugging_server_.get()) {
539 remote_debugging_server_.reset( 540 remote_debugging_server_.reset(
540 new RemoteDebuggingServer(profile, ip, port, frontend_url)); 541 new RemoteDebuggingServer(profile, host_desktop_type, ip, port,
542 frontend_url));
541 } 543 }
542 #endif 544 #endif
543 } 545 }
544 546
545 bool BrowserProcessImpl::IsShuttingDown() { 547 bool BrowserProcessImpl::IsShuttingDown() {
546 DCHECK(CalledOnValidThread()); 548 DCHECK(CalledOnValidThread());
547 return did_start_ && 0 == module_ref_count_; 549 return did_start_ && 0 == module_ref_count_;
548 } 550 }
549 551
550 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { 552 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
1033 } 1035 }
1034 1036
1035 void BrowserProcessImpl::OnAutoupdateTimer() { 1037 void BrowserProcessImpl::OnAutoupdateTimer() {
1036 if (CanAutorestartForUpdate()) { 1038 if (CanAutorestartForUpdate()) {
1037 DLOG(WARNING) << "Detected update. Restarting browser."; 1039 DLOG(WARNING) << "Detected update. Restarting browser.";
1038 RestartBackgroundInstance(); 1040 RestartBackgroundInstance();
1039 } 1041 }
1040 } 1042 }
1041 1043
1042 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) 1044 #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/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698