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 <set> | 9 #include <set> |
10 #include <vector> | 10 #include <vector> |
(...skipping 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
521 #if defined(ENABLE_AUTOMATION) | 521 #if defined(ENABLE_AUTOMATION) |
522 if (automation_provider_list_.get() == NULL) | 522 if (automation_provider_list_.get() == NULL) |
523 automation_provider_list_.reset(new AutomationProviderList()); | 523 automation_provider_list_.reset(new AutomationProviderList()); |
524 return automation_provider_list_.get(); | 524 return automation_provider_list_.get(); |
525 #else | 525 #else |
526 return NULL; | 526 return NULL; |
527 #endif | 527 #endif |
528 } | 528 } |
529 | 529 |
530 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( | 530 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( |
531 Profile* profile, | |
532 chrome::HostDesktopType host_desktop_type, | 531 chrome::HostDesktopType host_desktop_type, |
533 const std::string& ip, | 532 const std::string& ip, |
534 int port, | 533 int port, |
535 const std::string& frontend_url) { | 534 const std::string& frontend_url) { |
536 DCHECK(CalledOnValidThread()); | 535 DCHECK(CalledOnValidThread()); |
537 #if !defined(OS_ANDROID) | 536 #if !defined(OS_ANDROID) |
538 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser | 537 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser |
539 // is started with several profiles or existing browser process is reused. | 538 // is started with several profiles or existing browser process is reused. |
540 if (!remote_debugging_server_.get()) { | 539 if (!remote_debugging_server_.get()) { |
541 remote_debugging_server_.reset( | 540 remote_debugging_server_.reset( |
542 new RemoteDebuggingServer(profile, host_desktop_type, ip, port, | 541 new RemoteDebuggingServer(host_desktop_type, ip, port, |
543 frontend_url)); | 542 frontend_url)); |
544 } | 543 } |
545 #endif | 544 #endif |
546 } | 545 } |
547 | 546 |
548 bool BrowserProcessImpl::IsShuttingDown() { | 547 bool BrowserProcessImpl::IsShuttingDown() { |
549 DCHECK(CalledOnValidThread()); | 548 DCHECK(CalledOnValidThread()); |
550 return did_start_ && 0 == module_ref_count_; | 549 return did_start_ && 0 == module_ref_count_; |
551 } | 550 } |
552 | 551 |
(...skipping 492 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1045 } | 1044 } |
1046 | 1045 |
1047 void BrowserProcessImpl::OnAutoupdateTimer() { | 1046 void BrowserProcessImpl::OnAutoupdateTimer() { |
1048 if (CanAutorestartForUpdate()) { | 1047 if (CanAutorestartForUpdate()) { |
1049 DLOG(WARNING) << "Detected update. Restarting browser."; | 1048 DLOG(WARNING) << "Detected update. Restarting browser."; |
1050 RestartBackgroundInstance(); | 1049 RestartBackgroundInstance(); |
1051 } | 1050 } |
1052 } | 1051 } |
1053 | 1052 |
1054 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 1053 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
OLD | NEW |