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

Unified Diff: chrome/browser/android/tab_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_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index ab3a25c7059ce91a032b1e5667febeb75dcfae2f..08868b307036ceb8510ba41a2431c99aaf3bcabc 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -294,6 +294,7 @@ void TabAndroid::SwapTabContents(content::WebContents* old_contents,
content::WebContents* new_contents,
bool did_start_load,
bool did_finish_load) {
+#if !defined(USE_AURA)
JNIEnv* env = base::android::AttachCurrentThread();
Java_Tab_swapWebContents(
env,
@@ -301,6 +302,7 @@ void TabAndroid::SwapTabContents(content::WebContents* old_contents,
new_contents->GetJavaWebContents().obj(),
did_start_load,
did_finish_load);
+#endif
}
void TabAndroid::DefaultSearchProviderChanged(

Powered by Google App Engine
This is Rietveld 408576698