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

Unified Diff: ui/base/clipboard/clipboard_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
« no previous file with comments | « ui/android/window_android.cc ('k') | ui/base/l10n/l10n_util_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_android.cc
diff --git a/ui/base/clipboard/clipboard_android.cc b/ui/base/clipboard/clipboard_android.cc
index 9a552e7e15095d83e4967308c91eb1e3d71f9fd0..8e3944deba5fbf42df6c28a2447717006dc5bd5a 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -102,15 +102,14 @@ void ClipboardMap::CommitToAndroidClipboard() {
ConvertUTF8ToJavaString(env, map_[kPlainTextFormat].c_str());
DCHECK(html.obj() && text.obj());
- Java_Clipboard_setHTMLText(env, clipboard_manager_.obj(), html.obj(),
- text.obj());
+ Java_Clipboard_setHTMLText(env, clipboard_manager_, html, text);
} else if (base::ContainsKey(map_, kPlainTextFormat)) {
ScopedJavaLocalRef<jstring> str =
ConvertUTF8ToJavaString(env, map_[kPlainTextFormat].c_str());
DCHECK(str.obj());
- Java_Clipboard_setText(env, clipboard_manager_.obj(), str.obj());
+ Java_Clipboard_setText(env, clipboard_manager_, str);
} else {
- Java_Clipboard_clear(env, clipboard_manager_.obj());
+ Java_Clipboard_clear(env, clipboard_manager_);
NOTIMPLEMENTED();
}
}
@@ -119,7 +118,7 @@ void ClipboardMap::Clear() {
JNIEnv* env = AttachCurrentThread();
base::AutoLock lock(lock_);
map_.clear();
- Java_Clipboard_clear(env, clipboard_manager_.obj());
+ Java_Clipboard_clear(env, clipboard_manager_);
}
// Add a key:jstr pair to map, but only if jstr is not null, and also
@@ -155,9 +154,9 @@ void ClipboardMap::UpdateFromAndroidClipboard() {
std::map<std::string, std::string> android_clipboard_state;
ScopedJavaLocalRef<jstring> jtext =
- Java_Clipboard_getCoercedText(env, clipboard_manager_.obj());
+ Java_Clipboard_getCoercedText(env, clipboard_manager_);
ScopedJavaLocalRef<jstring> jhtml =
- Java_Clipboard_getHTMLText(env, clipboard_manager_.obj());
+ Java_Clipboard_getHTMLText(env, clipboard_manager_);
AddMapEntry(env, &android_clipboard_state, kPlainTextFormat, jtext);
AddMapEntry(env, &android_clipboard_state, kHTMLFormat, jhtml);
« no previous file with comments | « ui/android/window_android.cc ('k') | ui/base/l10n/l10n_util_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698