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

Unified Diff: ui/base/clipboard/clipboard_android.cc

Issue 2230183002: ui: Use stl utilities from the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased 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/arc/notification/arc_notification_manager_unittest.cc ('k') | ui/base/ime/win/tsf_input_scope.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 de51d04aa1fc839f4dbf77d5683900e998926f76..409af313f3acef3e7ce830acd73e61290440f29d 100644
--- a/ui/base/clipboard/clipboard_android.cc
+++ b/ui/base/clipboard/clipboard_android.cc
@@ -85,7 +85,7 @@ std::string ClipboardMap::Get(const std::string& format) {
bool ClipboardMap::HasFormat(const std::string& format) {
base::AutoLock lock(lock_);
UpdateFromAndroidClipboard();
- return ContainsKey(map_, format);
+ return base::ContainsKey(map_, format);
}
void ClipboardMap::Set(const std::string& format, const std::string& data) {
@@ -96,10 +96,10 @@ void ClipboardMap::Set(const std::string& format, const std::string& data) {
void ClipboardMap::CommitToAndroidClipboard() {
JNIEnv* env = AttachCurrentThread();
base::AutoLock lock(lock_);
- if (ContainsKey(map_, kHTMLFormat)) {
+ if (base::ContainsKey(map_, kHTMLFormat)) {
// Android's API for storing HTML content on the clipboard requires a plain-
// text representation to be available as well.
- if (!ContainsKey(map_, kPlainTextFormat))
+ if (!base::ContainsKey(map_, kPlainTextFormat))
return;
ScopedJavaLocalRef<jstring> html =
@@ -110,7 +110,7 @@ void ClipboardMap::CommitToAndroidClipboard() {
DCHECK(html.obj() && text.obj());
Java_Clipboard_setHTMLText(env, clipboard_manager_.obj(), html.obj(),
text.obj());
- } else if (ContainsKey(map_, kPlainTextFormat)) {
+ } else if (base::ContainsKey(map_, kPlainTextFormat)) {
ScopedJavaLocalRef<jstring> str =
ConvertUTF8ToJavaString(env, map_[kPlainTextFormat].c_str());
DCHECK(str.obj());
« no previous file with comments | « ui/arc/notification/arc_notification_manager_unittest.cc ('k') | ui/base/ime/win/tsf_input_scope.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698