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

Unified Diff: content/shell/browser/shell_android.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: content/shell/browser/shell_android.cc
diff --git a/content/shell/browser/shell_android.cc b/content/shell/browser/shell_android.cc
index 111aff15bf78013b515321ec85996ac0e97dc80a..52189222fd94ee0b44c79e61243342df81776cd6 100644
--- a/content/shell/browser/shell_android.cc
+++ b/content/shell/browser/shell_android.cc
@@ -33,25 +33,25 @@ void Shell::PlatformCleanUp() {
JNIEnv* env = AttachCurrentThread();
if (java_object_.is_null())
return;
- Java_Shell_onNativeDestroyed(env, java_object_.obj());
+ Java_Shell_onNativeDestroyed(env, java_object_);
}
void Shell::PlatformEnableUIControl(UIControl control, bool is_enabled) {
JNIEnv* env = AttachCurrentThread();
if (java_object_.is_null())
return;
- Java_Shell_enableUiControl(env, java_object_.obj(), control, is_enabled);
+ Java_Shell_enableUiControl(env, java_object_, control, is_enabled);
}
void Shell::PlatformSetAddressBarURL(const GURL& url) {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env, url.spec());
- Java_Shell_onUpdateUrl(env, java_object_.obj(), j_url.obj());
+ Java_Shell_onUpdateUrl(env, java_object_, j_url);
}
void Shell::PlatformSetIsLoading(bool loading) {
JNIEnv* env = AttachCurrentThread();
- Java_Shell_setIsLoading(env, java_object_.obj(), loading);
+ Java_Shell_setIsLoading(env, java_object_, loading);
}
void Shell::PlatformCreateWindow(int width, int height) {
@@ -60,8 +60,8 @@ void Shell::PlatformCreateWindow(int width, int height) {
void Shell::PlatformSetContents() {
JNIEnv* env = AttachCurrentThread();
- Java_Shell_initFromNativeTabContents(
- env, java_object_.obj(), web_contents()->GetJavaWebContents().obj());
+ Java_Shell_initFromNativeTabContents(env, java_object_,
+ web_contents()->GetJavaWebContents());
}
void Shell::PlatformResizeSubViews() {
@@ -74,20 +74,19 @@ void Shell::PlatformSetTitle(const base::string16& title) {
void Shell::LoadProgressChanged(WebContents* source, double progress) {
JNIEnv* env = AttachCurrentThread();
- Java_Shell_onLoadProgressChanged(env, java_object_.obj(), progress);
+ Java_Shell_onLoadProgressChanged(env, java_object_, progress);
}
void Shell::PlatformToggleFullscreenModeForTab(WebContents* web_contents,
bool enter_fullscreen) {
JNIEnv* env = AttachCurrentThread();
- Java_Shell_toggleFullscreenModeForTab(
- env, java_object_.obj(), enter_fullscreen);
+ Java_Shell_toggleFullscreenModeForTab(env, java_object_, enter_fullscreen);
}
bool Shell::PlatformIsFullscreenForTabOrPending(
const WebContents* web_contents) const {
JNIEnv* env = AttachCurrentThread();
- return Java_Shell_isFullscreenForTabOrPending(env, java_object_.obj());
+ return Java_Shell_isFullscreenForTabOrPending(env, java_object_);
}
void Shell::Close() {
« no previous file with comments | « content/public/test/nested_message_pump_android.cc ('k') | content/shell/browser/shell_mojo_test_utils_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698