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

Unified Diff: chrome/browser/android/shortcut_helper.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/android/shortcut_helper.cc
diff --git a/chrome/browser/android/shortcut_helper.cc b/chrome/browser/android/shortcut_helper.cc
index 26000d260338a4c30d0821f095c6efadd7b11537..6ac62f1db48b442f74eb293007381e5a867f7637 100644
--- a/chrome/browser/android/shortcut_helper.cc
+++ b/chrome/browser/android/shortcut_helper.cc
@@ -127,22 +127,11 @@ void ShortcutHelper::AddWebappWithSkBitmap(
uintptr_t callback_pointer =
reinterpret_cast<uintptr_t>(new base::Closure(splash_image_callback));
- Java_ShortcutHelper_addWebapp(
- env,
- java_webapp_id.obj(),
- java_url.obj(),
- java_scope_url.obj(),
- java_user_title.obj(),
- java_name.obj(),
- java_short_name.obj(),
- java_icon_url.obj(),
- java_bitmap.obj(),
- info.display,
- info.orientation,
- info.source,
- info.theme_color,
- info.background_color,
- callback_pointer);
+ Java_ShortcutHelper_addWebapp(env, java_webapp_id, java_url, java_scope_url,
+ java_user_title, java_name, java_short_name,
+ java_icon_url, java_bitmap, info.display,
+ info.orientation, info.source, info.theme_color,
+ info.background_color, callback_pointer);
}
void ShortcutHelper::AddShortcutWithSkBitmap(
@@ -157,8 +146,8 @@ void ShortcutHelper::AddShortcutWithSkBitmap(
if (icon_bitmap.getSize())
java_bitmap = gfx::ConvertToJavaBitmap(&icon_bitmap);
- Java_ShortcutHelper_addShortcut(env, java_url.obj(), java_user_title.obj(),
- java_bitmap.obj(), info.source);
+ Java_ShortcutHelper_addShortcut(env, java_url, java_user_title, java_bitmap,
+ info.source);
}
void ShortcutHelper::OnBuiltWebApk(bool success) {
@@ -223,10 +212,8 @@ void ShortcutHelper::StoreWebappSplashImage(
ScopedJavaLocalRef<jobject> java_splash_image =
gfx::ConvertToJavaBitmap(&splash_image);
- Java_ShortcutHelper_storeWebappSplashImage(
- env,
- java_webapp_id.obj(),
- java_splash_image.obj());
+ Java_ShortcutHelper_storeWebappSplashImage(env, java_webapp_id,
+ java_splash_image);
}
// static
@@ -245,8 +232,8 @@ SkBitmap ShortcutHelper::FinalizeLauncherIconInBackground(
bitmap.height())) {
ScopedJavaLocalRef<jobject> java_bitmap =
gfx::ConvertToJavaBitmap(&bitmap);
- result = Java_ShortcutHelper_createHomeScreenIconFromWebIcon(
- env, java_bitmap.obj());
+ result =
+ Java_ShortcutHelper_createHomeScreenIconFromWebIcon(env, java_bitmap);
}
}
@@ -261,7 +248,7 @@ SkBitmap ShortcutHelper::FinalizeLauncherIconInBackground(
*is_generated = true;
result = Java_ShortcutHelper_generateHomeScreenIcon(
- env, java_url.obj(), SkColorGetR(mean_color), SkColorGetG(mean_color),
+ env, java_url, SkColorGetR(mean_color), SkColorGetG(mean_color),
SkColorGetB(mean_color));
}
@@ -275,7 +262,7 @@ bool ShortcutHelper::IsWebApkInstalled(const GURL& url) {
JNIEnv* env = base::android::AttachCurrentThread();
ScopedJavaLocalRef<jstring> java_url =
base::android::ConvertUTF8ToJavaString(env, url.spec());
- return Java_ShortcutHelper_isWebApkInstalled(env, java_url.obj());
+ return Java_ShortcutHelper_isWebApkInstalled(env, java_url);
}
GURL ShortcutHelper::GetScopeFromURL(const GURL& url) {
@@ -283,7 +270,7 @@ GURL ShortcutHelper::GetScopeFromURL(const GURL& url) {
ScopedJavaLocalRef<jstring> java_url =
base::android::ConvertUTF8ToJavaString(env, url.spec());
ScopedJavaLocalRef<jstring> java_scope_url =
- Java_ShortcutHelper_getScopeFromUrl(env, java_url.obj());
+ Java_ShortcutHelper_getScopeFromUrl(env, java_url);
return GURL(base::android::ConvertJavaStringToUTF16(env, java_scope_url));
}
« no previous file with comments | « chrome/browser/android/service_tab_launcher.cc ('k') | chrome/browser/android/signin/account_management_screen_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698