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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/android/tab_state.h" 5 #include "chrome/browser/android/tab_state.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 #include <limits> 8 #include <limits>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 430 matching lines...) Expand 10 before | Expand all | Expand 10 after
441 &scoped_entries); 441 &scoped_entries);
442 return web_contents.release(); 442 return web_contents.release();
443 } 443 }
444 444
445 jobject WebContentsState::RestoreContentsFromByteBuffer( 445 jobject WebContentsState::RestoreContentsFromByteBuffer(
446 JNIEnv* env, 446 JNIEnv* env,
447 jclass clazz, 447 jclass clazz,
448 jobject state, 448 jobject state,
449 jint saved_state_version, 449 jint saved_state_version,
450 jboolean initially_hidden) { 450 jboolean initially_hidden) {
451 #if !defined(USE_AURA)
451 void* data = env->GetDirectBufferAddress(state); 452 void* data = env->GetDirectBufferAddress(state);
452 int size = env->GetDirectBufferCapacity(state); 453 int size = env->GetDirectBufferCapacity(state);
453 454
454 WebContents* web_contents = WebContentsState::RestoreContentsFromByteBuffer( 455 WebContents* web_contents = WebContentsState::RestoreContentsFromByteBuffer(
455 data, 456 data,
456 size, 457 size,
457 saved_state_version, 458 saved_state_version,
458 initially_hidden); 459 initially_hidden);
459 460
460 return web_contents ? web_contents->GetJavaWebContents().Release() : nullptr; 461 return web_contents ? web_contents->GetJavaWebContents().Release() : nullptr;
462 #else
463 return nullptr;
464 #endif
461 } 465 }
462 466
463 ScopedJavaLocalRef<jobject> 467 ScopedJavaLocalRef<jobject>
464 WebContentsState::CreateSingleNavigationStateAsByteBuffer( 468 WebContentsState::CreateSingleNavigationStateAsByteBuffer(
465 JNIEnv* env, 469 JNIEnv* env,
466 jstring url, 470 jstring url,
467 jstring referrer_url, 471 jstring referrer_url,
468 jint referrer_policy, 472 jint referrer_policy,
469 jboolean is_off_the_record) { 473 jboolean is_off_the_record) {
470 content::Referrer referrer; 474 content::Referrer referrer;
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 env, data, size, saved_state_version); 556 env, data, size, saved_state_version);
553 return result.Release(); 557 return result.Release();
554 } 558 }
555 559
556 // Creates a historical tab entry from the serialized tab contents contained 560 // Creates a historical tab entry from the serialized tab contents contained
557 // within |state|. 561 // within |state|.
558 static void CreateHistoricalTab(JNIEnv* env, 562 static void CreateHistoricalTab(JNIEnv* env,
559 jclass clazz, 563 jclass clazz,
560 jobject state, 564 jobject state,
561 jint saved_state_version) { 565 jint saved_state_version) {
566 #if !defined(USE_AURA)
562 scoped_ptr<WebContents> web_contents( 567 scoped_ptr<WebContents> web_contents(
563 WebContents::FromJavaWebContents( 568 WebContents::FromJavaWebContents(
564 WebContentsState::RestoreContentsFromByteBuffer(env, 569 WebContentsState::RestoreContentsFromByteBuffer(env,
565 clazz, 570 clazz,
566 state, 571 state,
567 saved_state_version, 572 saved_state_version,
568 true))); 573 true)));
569 if (web_contents.get()) 574 if (web_contents.get())
570 TabAndroid::CreateHistoricalTabFromContents(web_contents.get()); 575 TabAndroid::CreateHistoricalTabFromContents(web_contents.get());
576 #endif
571 } 577 }
572 578
573 bool RegisterTabState(JNIEnv* env) { 579 bool RegisterTabState(JNIEnv* env) {
574 return RegisterNativesImpl(env); 580 return RegisterNativesImpl(env);
575 } 581 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698