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

Unified Diff: chrome/browser/prerender/external_prerender_handler_android.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: chrome/browser/prerender/external_prerender_handler_android.cc
diff --git a/chrome/browser/prerender/external_prerender_handler_android.cc b/chrome/browser/prerender/external_prerender_handler_android.cc
index 9ff7c0dc25e6ec7e10fdaed704544ad50168fe89..f4d59d69b384fa53ca8aceff627cd9820c7f4f43 100644
--- a/chrome/browser/prerender/external_prerender_handler_android.cc
+++ b/chrome/browser/prerender/external_prerender_handler_android.cc
@@ -30,6 +30,7 @@ bool ExternalPrerenderHandlerAndroid::AddPrerender(JNIEnv* env,
jstring jreferrer,
jint width,
jint height) {
+#if !defined(USE_AURA)
Profile* profile = ProfileAndroid::FromProfileAndroid(jprofile);
GURL url = GURL(ConvertJavaStringToUTF16(env, jurl));
@@ -57,6 +58,7 @@ bool ExternalPrerenderHandlerAndroid::AddPrerender(JNIEnv* env,
gfx::Size(width, height)));
if (!prerender_handle_)
return false;
+#endif
return true;
}
@@ -73,6 +75,7 @@ static jboolean HasPrerenderedUrl(JNIEnv* env,
jobject jprofile,
jstring jurl,
jobject jweb_contents) {
+#if !defined(USE_AURA)
if (jurl == NULL)
return false;
@@ -87,6 +90,9 @@ static jboolean HasPrerenderedUrl(JNIEnv* env,
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
return prerender_manager->HasPrerenderedUrl(url, web_contents);
+#else
+ return false;
+#endif
}
ExternalPrerenderHandlerAndroid::ExternalPrerenderHandlerAndroid() {}

Powered by Google App Engine
This is Rietveld 408576698