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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 10885023: Use ChromeBrowserMainPartsAndroid. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: thestig's comments Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chrome_browser_main.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 7718a0b16510441fd8b2bf501c11ba94337d3bef..3b644e81fe7030ae5d0b0d3fd274d4a5ac0fcb3e 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -208,8 +208,10 @@ void BrowserProcessImpl::StartTearDown() {
// Need to clear profiles (download managers) before the io_thread_.
profile_manager_.reset();
+#if !defined(OS_ANDROID)
// Debugger must be cleaned up before IO thread and NotificationService.
remote_debugging_server_.reset();
+#endif
ExtensionTabIdMap::GetInstance()->Shutdown();
@@ -477,12 +479,14 @@ void BrowserProcessImpl::CreateDevToolsHttpProtocolHandler(
int port,
const std::string& frontend_url) {
DCHECK(CalledOnValidThread());
+#if !defined(OS_ANDROID)
// StartupBrowserCreator::LaunchBrowser can be run multiple times when browser
// is started with several profiles or existing browser process is reused.
if (!remote_debugging_server_.get()) {
remote_debugging_server_.reset(
new RemoteDebuggingServer(profile, ip, port, frontend_url));
}
+#endif
}
bool BrowserProcessImpl::IsShuttingDown() {
« no previous file with comments | « chrome/browser/browser_process_impl.h ('k') | chrome/browser/chrome_browser_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698