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

Unified Diff: chrome/browser/android/tab/thumbnail_tab_helper_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/android/tab/thumbnail_tab_helper_android.cc
diff --git a/chrome/browser/android/tab/thumbnail_tab_helper_android.cc b/chrome/browser/android/tab/thumbnail_tab_helper_android.cc
index 3c6328fda4b048855d0e7ec570dfc86723344731..0b9e8f886d9178d5b2478b120a44122065224fe0 100644
--- a/chrome/browser/android/tab/thumbnail_tab_helper_android.cc
+++ b/chrome/browser/android/tab/thumbnail_tab_helper_android.cc
@@ -30,6 +30,7 @@ bool RegisterThumbnailTabHelperAndroid(JNIEnv* env) {
static void InitThumbnailHelper(JNIEnv* env,
jclass clazz,
jobject jweb_contents) {
+#if !defined(USE_AURA)
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
DCHECK(web_contents);
@@ -42,6 +43,7 @@ static void InitThumbnailHelper(JNIEnv* env,
ThumbnailTabHelper::FromWebContents(web_contents);
if (thumbnail_tab_helper)
thumbnail_tab_helper->set_enabled(false);
+#endif
}
static jboolean ShouldUpdateThumbnail(
@@ -60,6 +62,7 @@ static void UpdateThumbnail(JNIEnv* env,
jobject jweb_contents,
jobject bitmap,
jboolean jat_top) {
+#if !defined(USE_AURA)
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
DCHECK(web_contents);
@@ -95,4 +98,5 @@ static void UpdateThumbnail(JNIEnv* env,
gfx::Image image = gfx::Image::CreateFrom1xBitmap(sk_bitmap);
const GURL& url = web_contents->GetURL();
ts->SetPageThumbnail(url, image, score);
+#endif
}

Powered by Google App Engine
This is Rietveld 408576698