| Index: chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc
|
| diff --git a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc
|
| index d8590e920fb5aa45bc08f22dbee3f877b67165b7..0d3949f4d6f582903657717ef71ee88a699b79aa 100644
|
| --- a/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc
|
| +++ b/chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc
|
| @@ -47,12 +47,13 @@ TabModelJniBridge::TabModelJniBridge(JNIEnv* env,
|
| TabModelList::AddTabModel(this);
|
| }
|
|
|
| -void TabModelJniBridge::Destroy(JNIEnv* env, jobject obj) {
|
| +void TabModelJniBridge::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
|
| delete this;
|
| }
|
|
|
| -ScopedJavaLocalRef<jobject> TabModelJniBridge::GetProfileAndroid(JNIEnv* env,
|
| - jobject obj) {
|
| +ScopedJavaLocalRef<jobject> TabModelJniBridge::GetProfileAndroid(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& obj) {
|
| ProfileAndroid* profile_android = ProfileAndroid::FromProfile(GetProfile());
|
| if (!profile_android)
|
| return ScopedJavaLocalRef<jobject>();
|
| @@ -60,8 +61,8 @@ ScopedJavaLocalRef<jobject> TabModelJniBridge::GetProfileAndroid(JNIEnv* env,
|
| }
|
|
|
| void TabModelJniBridge::TabAddedToModel(JNIEnv* env,
|
| - jobject obj,
|
| - jobject jtab) {
|
| + const JavaParamRef<jobject>& obj,
|
| + const JavaParamRef<jobject>& jtab) {
|
| // Tab#initialize() should have been called by now otherwise we can't push
|
| // the window id.
|
| TabAndroid* tab = TabAndroid::GetNativeTab(env, jtab);
|
| @@ -145,8 +146,9 @@ bool TabModelJniBridge::IsSessionRestoreInProgress() const {
|
| env, java_object_.get(env).obj());
|
| }
|
|
|
| -void TabModelJniBridge::BroadcastSessionRestoreComplete(JNIEnv* env,
|
| - jobject obj) {
|
| +void TabModelJniBridge::BroadcastSessionRestoreComplete(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jobject>& obj) {
|
| TabModel::BroadcastSessionRestoreComplete();
|
| }
|
|
|
|
|