Chromium Code Reviews| 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 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 470 return NULL; | 470 return NULL; |
| 471 #endif | 471 #endif |
| 472 } | 472 } |
| 473 | 473 |
| 474 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( | 474 void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler( |
| 475 Profile* profile, | 475 Profile* profile, |
| 476 const std::string& ip, | 476 const std::string& ip, |
| 477 int port, | 477 int port, |
| 478 const std::string& frontend_url) { | 478 const std::string& frontend_url) { |
| 479 DCHECK(CalledOnValidThread()); | 479 DCHECK(CalledOnValidThread()); |
| 480 #if !defined(OS_ANDROID) | |
| 480 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser | 481 // StartupBrowserCreator::LaunchBrowser can be run multiple times when browser |
| 481 // is started with several profiles or existing browser process is reused. | 482 // is started with several profiles or existing browser process is reused. |
| 482 if (!remote_debugging_server_.get()) { | 483 if (!remote_debugging_server_.get()) { |
|
Lei Zhang
2012/08/29 19:23:57
Since |remote_debugging_server_| isn't used anywhe
Yaron
2012/08/29 20:48:33
Done.
| |
| 483 remote_debugging_server_.reset( | 484 remote_debugging_server_.reset( |
| 484 new RemoteDebuggingServer(profile, ip, port, frontend_url)); | 485 new RemoteDebuggingServer(profile, ip, port, frontend_url)); |
| 485 } | 486 } |
| 487 #endif | |
| 486 } | 488 } |
| 487 | 489 |
| 488 bool BrowserProcessImpl::IsShuttingDown() { | 490 bool BrowserProcessImpl::IsShuttingDown() { |
| 489 DCHECK(CalledOnValidThread()); | 491 DCHECK(CalledOnValidThread()); |
| 490 return did_start_ && 0 == module_ref_count_; | 492 return did_start_ && 0 == module_ref_count_; |
| 491 } | 493 } |
| 492 | 494 |
| 493 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { | 495 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() { |
| 494 // TODO(abarth): DCHECK(CalledOnValidThread()); | 496 // TODO(abarth): DCHECK(CalledOnValidThread()); |
| 495 // http://code.google.com/p/chromium/issues/detail?id=6828 | 497 // http://code.google.com/p/chromium/issues/detail?id=6828 |
| (...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 927 } | 929 } |
| 928 | 930 |
| 929 void BrowserProcessImpl::OnAutoupdateTimer() { | 931 void BrowserProcessImpl::OnAutoupdateTimer() { |
| 930 if (CanAutorestartForUpdate()) { | 932 if (CanAutorestartForUpdate()) { |
| 931 DLOG(WARNING) << "Detected update. Restarting browser."; | 933 DLOG(WARNING) << "Detected update. Restarting browser."; |
| 932 RestartBackgroundInstance(); | 934 RestartBackgroundInstance(); |
| 933 } | 935 } |
| 934 } | 936 } |
| 935 | 937 |
| 936 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) | 938 #endif // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) |
| OLD | NEW |