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

Unified Diff: content/shell/shell_browser_main_parts.cc

Issue 10823051: ContentShell rendering support on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address jam's comments Created 8 years, 5 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 | « content/shell/shell_android.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_browser_main_parts.cc
diff --git a/content/shell/shell_browser_main_parts.cc b/content/shell/shell_browser_main_parts.cc
index a55754912d8384f935db104dfd6cc4477dfd9f33..b8ba066f32abb610032b004f9c3d70bacb75eee2 100644
--- a/content/shell/shell_browser_main_parts.cc
+++ b/content/shell/shell_browser_main_parts.cc
@@ -32,6 +32,12 @@ static GURL GetStartupURL() {
if (command_line->HasSwitch(switches::kContentBrowserTest))
return GURL();
const CommandLine::StringVector& args = command_line->GetArgs();
+
+#if defined(OS_ANDROID)
+ // Delay renderer creation on Android until surface is ready.
+ return GURL();
+#endif
+
if (args.empty())
return GURL("http://www.google.com/");
« no previous file with comments | « content/shell/shell_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698