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

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: 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
« content/shell/shell_android.cc ('K') | « 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 87bf75be4c6d4d0f56795b6673eb7a2726a31e26..06431ccc17838c0b2bdefa6d6b0f4bcde46b2057 100644
--- a/content/shell/shell_browser_main_parts.cc
+++ b/content/shell/shell_browser_main_parts.cc
@@ -29,6 +29,12 @@ namespace content {
static GURL GetStartupURL() {
const CommandLine::StringVector& args =
CommandLine::ForCurrentProcess()->GetArgs();
+
+#if defined(OS_ANDROID)
klobag.chromium 2012/07/27 19:42:22 Consider to modify the commandLine args to pass ""
Ted C 2012/07/27 20:31:15 Ah ha...I see the load URL need now. We need to f
no sievers 2012/07/31 01:28:44 Hrm, I had no immediate luck. gurl.cc would dcheck
+ // Delay renderer creation on Android until surface is ready.
+ return GURL();
+#endif
+
if (args.empty())
return GURL("http://www.google.com/");
« content/shell/shell_android.cc ('K') | « content/shell/shell_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698