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

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

Issue 2315323002: Pass JavaRef to WebContents::FromJavaWebContents. (Closed)
Patch Set: Created 4 years, 3 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 2706aa9876259d3a3ba6c39c9eca3f5b78ae9517..eb20bbd115b8edb2d2b97e81516227c0727a3d55 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
@@ -88,8 +88,7 @@ void TabModelJniBridge::CreateTab(TabAndroid* parent,
int parent_tab_id) {
JNIEnv* env = AttachCurrentThread();
Java_TabModelJniBridge_createTabWithWebContents(
- env, java_object_.get(env).obj(),
- (parent ? parent->GetJavaObject().obj() : nullptr),
+ env, java_object_.get(env), (parent ? parent->GetJavaObject() : nullptr),
web_contents->GetBrowserContext()->IsOffTheRecord(),
web_contents->GetJavaWebContents(), parent_tab_id);
}
@@ -104,8 +103,7 @@ TabAndroid* TabModelJniBridge::GetTabAt(int index) const {
ScopedJavaLocalRef<jobject> jtab =
Java_TabModelJniBridge_getTabAt(env, java_object_.get(env), index);
- return jtab.is_null() ?
- NULL : TabAndroid::GetNativeTab(env, jtab.obj());
+ return jtab.is_null() ? NULL : TabAndroid::GetNativeTab(env, jtab);
}
void TabModelJniBridge::SetActiveIndex(int index) {
@@ -131,7 +129,7 @@ WebContents* TabModelJniBridge::CreateNewTabForDevTools(
VLOG(0) << "Failed to create java tab";
return NULL;
}
- TabAndroid* tab = TabAndroid::GetNativeTab(env, obj.obj());
+ TabAndroid* tab = TabAndroid::GetNativeTab(env, obj);
if (!tab) {
VLOG(0) << "Failed to create java tab";
return NULL;

Powered by Google App Engine
This is Rietveld 408576698