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

Unified Diff: chrome/browser/android/tab_state.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_state.cc
diff --git a/chrome/browser/android/tab_state.cc b/chrome/browser/android/tab_state.cc
index f7266437c365ebfcb3f7ebb13de798b9370ca0a1..c64038430733f0189fd6630fe007501ecdf73e8c 100644
--- a/chrome/browser/android/tab_state.cc
+++ b/chrome/browser/android/tab_state.cc
@@ -448,6 +448,7 @@ jobject WebContentsState::RestoreContentsFromByteBuffer(
jobject state,
jint saved_state_version,
jboolean initially_hidden) {
+#if !defined(USE_AURA)
void* data = env->GetDirectBufferAddress(state);
int size = env->GetDirectBufferCapacity(state);
@@ -458,6 +459,9 @@ jobject WebContentsState::RestoreContentsFromByteBuffer(
initially_hidden);
return web_contents ? web_contents->GetJavaWebContents().Release() : nullptr;
+#else
+ return nullptr;
+#endif
}
ScopedJavaLocalRef<jobject>
@@ -559,6 +563,7 @@ static void CreateHistoricalTab(JNIEnv* env,
jclass clazz,
jobject state,
jint saved_state_version) {
+#if !defined(USE_AURA)
scoped_ptr<WebContents> web_contents(
WebContents::FromJavaWebContents(
WebContentsState::RestoreContentsFromByteBuffer(env,
@@ -568,6 +573,7 @@ static void CreateHistoricalTab(JNIEnv* env,
true)));
if (web_contents.get())
TabAndroid::CreateHistoricalTabFromContents(web_contents.get());
+#endif
}
bool RegisterTabState(JNIEnv* env) {

Powered by Google App Engine
This is Rietveld 408576698