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 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
545 automation_provider_list_.reset(new AutomationProviderList()); | 545 automation_provider_list_.reset(new AutomationProviderList()); |
546 return automation_provider_list_.get(); | 546 return automation_provider_list_.get(); |
547 #else | 547 #else |
548 return NULL; | 548 return NULL; |
549 #endif | 549 #endif |
550 } | 550 } |
551 | 551 |
552 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( | 552 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( |
553 chrome::HostDesktopType host_desktop_type, | 553 chrome::HostDesktopType host_desktop_type, |
554 const std::string& ip, | 554 const std::string& ip, |
555 int port, | 555 int port) { |
556 const std::string& frontend_url) { | |
557 DCHECK(CalledOnValidThread()); | 556 DCHECK(CalledOnValidThread()); |
558 #if !defined(OS_ANDROID) | 557 #if !defined(OS_ANDROID) |
559 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser | 558 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser |
560 // is started with several profiles or existing browser process is reused. | 559 // is started with several profiles or existing browser process is reused. |
561 if (!remote_debugging_server_.get()) { | 560 if (!remote_debugging_server_.get()) { |
562 remote_debugging_server_.reset( | 561 remote_debugging_server_.reset( |
563 new RemoteDebuggingServer(host_desktop_type, ip, port, | 562 new RemoteDebuggingServer(host_desktop_type, ip, port)); |
564 frontend_url)); | |
565 } | 563 } |
566 #endif | 564 #endif |
567 } | 565 } |
568 | 566 |
569 bool BrowserProcessImpl::IsShuttingDown() { | 567 bool BrowserProcessImpl::IsShuttingDown() { |
570 DCHECK(CalledOnValidThread()); | 568 DCHECK(CalledOnValidThread()); |
571 return did_start_ && 0 == module_ref_count_; | 569 return did_start_ && 0 == module_ref_count_; |
572 } | 570 } |
573 | 571 |
574 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { | 572 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { |
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1086 } | 1084 } |
1087 | 1085 |
1088 void BrowserProcessImpl::OnAutoupdateTimer() { | 1086 void BrowserProcessImpl::OnAutoupdateTimer() { |
1089 if (CanAutorestartForUpdate()) { | 1087 if (CanAutorestartForUpdate()) { |
1090 DLOG(WARNING) << "Detected update. Restarting browser."; | 1088 DLOG(WARNING) << "Detected update. Restarting browser."; |
1091 RestartBackgroundInstance(); | 1089 RestartBackgroundInstance(); |
1092 } | 1090 } |
1093 } | 1091 } |
1094 | 1092 |
1095 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1093 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |