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

Unified Diff: chrome/browser/ui/android/tab_model/tab_model_jni_bridge.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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/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 dd8f5cc1a7c537d880bafc74965efe3f767b5dbb..fbd2e269154f4421debfb86249944c87db7b1ae2 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
@@ -75,12 +75,12 @@ void TabModelJniBridge::TabAddedToModel(JNIEnv* env,
int TabModelJniBridge::GetTabCount() const {
JNIEnv* env = AttachCurrentThread();
- return Java_TabModelJniBridge_getCount(env, java_object_.get(env).obj());
+ return Java_TabModelJniBridge_getCount(env, java_object_.get(env));
}
int TabModelJniBridge::GetActiveIndex() const {
JNIEnv* env = AttachCurrentThread();
- return Java_TabModelJniBridge_index(env, java_object_.get(env).obj());
+ return Java_TabModelJniBridge_index(env, java_object_.get(env));
}
void TabModelJniBridge::CreateTab(TabAndroid* parent,
@@ -91,8 +91,7 @@ void TabModelJniBridge::CreateTab(TabAndroid* parent,
env, java_object_.get(env).obj(),
(parent ? parent->GetJavaObject().obj() : nullptr),
web_contents->GetBrowserContext()->IsOffTheRecord(),
- web_contents->GetJavaWebContents().obj(),
- parent_tab_id);
+ web_contents->GetJavaWebContents(), parent_tab_id);
}
WebContents* TabModelJniBridge::GetWebContentsAt(int index) const {
@@ -103,9 +102,7 @@ WebContents* TabModelJniBridge::GetWebContentsAt(int index) const {
TabAndroid* TabModelJniBridge::GetTabAt(int index) const {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> jtab =
- Java_TabModelJniBridge_getTabAt(env,
- java_object_.get(env).obj(),
- index);
+ Java_TabModelJniBridge_getTabAt(env, java_object_.get(env), index);
return jtab.is_null() ?
NULL : TabAndroid::GetNativeTab(env, jtab.obj());
@@ -113,14 +110,12 @@ TabAndroid* TabModelJniBridge::GetTabAt(int index) const {
void TabModelJniBridge::SetActiveIndex(int index) {
JNIEnv* env = AttachCurrentThread();
- Java_TabModelJniBridge_setIndex(env, java_object_.get(env).obj(), index);
+ Java_TabModelJniBridge_setIndex(env, java_object_.get(env), index);
}
void TabModelJniBridge::CloseTabAt(int index) {
JNIEnv* env = AttachCurrentThread();
- Java_TabModelJniBridge_closeTabAt(env,
- java_object_.get(env).obj(),
- index);
+ Java_TabModelJniBridge_closeTabAt(env, java_object_.get(env), index);
}
WebContents* TabModelJniBridge::CreateNewTabForDevTools(
@@ -130,10 +125,8 @@ WebContents* TabModelJniBridge::CreateNewTabForDevTools(
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> jurl = ConvertUTF8ToJavaString(env, url.spec());
ScopedJavaLocalRef<jobject> obj =
- Java_TabModelJniBridge_createNewTabForDevTools(
- env,
- java_object_.get(env).obj(),
- jurl.obj());
+ Java_TabModelJniBridge_createNewTabForDevTools(env, java_object_.get(env),
+ jurl);
if (obj.is_null()) {
VLOG(0) << "Failed to create java tab";
return NULL;
@@ -149,7 +142,7 @@ WebContents* TabModelJniBridge::CreateNewTabForDevTools(
bool TabModelJniBridge::IsSessionRestoreInProgress() const {
JNIEnv* env = AttachCurrentThread();
return Java_TabModelJniBridge_isSessionRestoreInProgress(
- env, java_object_.get(env).obj());
+ env, java_object_.get(env));
}
void TabModelJniBridge::BroadcastSessionRestoreComplete(

Powered by Google App Engine
This is Rietveld 408576698