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

Unified Diff: content/browser/browser_main_loop.cc

Issue 1015633003: [Android WebView] Fix the startup sequence for in-process mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/browser_main_loop.cc
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index bf495b9acee30d23d3e376129b6ebe550fd0121c..9b3d27c823d7e087592044294ffa3788d2f4e6ef 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -614,13 +614,6 @@ int BrowserMainLoop::PreCreateThreads() {
}
#endif
-#if !defined(OS_IOS) && (!defined(GOOGLE_CHROME_BUILD) || defined(OS_ANDROID))
- // Single-process is an unsupported and not fully tested mode, so
- // don't enable it for official Chrome builds (except on Android).
- if (parsed_command_line_.HasSwitch(switches::kSingleProcess))
- RenderProcessHost::SetRunRendererInProcess(true);
-#endif
-
// Need to initialize in-process GpuDataManager before creating threads.
// It's unsafe to append the gpu command line switches to the global
// CommandLine::ForCurrentProcess object after threads are created.
@@ -640,6 +633,13 @@ int BrowserMainLoop::PreCreateThreads() {
GpuDataManagerImpl::GetInstance()->Initialize();
}
+#if !defined(OS_IOS) && (!defined(GOOGLE_CHROME_BUILD) || defined(OS_ANDROID))
+ // Single-process is an unsupported and not fully tested mode, so
+ // don't enable it for official Chrome builds (except on Android).
+ if (parsed_command_line_.HasSwitch(switches::kSingleProcess))
+ RenderProcessHost::SetRunRendererInProcess(true);
+#endif
+
return result_code_;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698