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

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

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | « tools/gdb/gdb_chrome.py ('k') | ui/base/ime/chromeos/character_composer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/clipboard/clipboard_win.cc
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index b2f6e0c3565e164f14f96d567cc841d35dd7f94e..f6bd6e8a76c1b84666b60311327f2492340a00c6 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -444,7 +444,7 @@ void Clipboard::ReadText(ClipboardType type, base::string16* result) const {
if (!data)
return;
- result->assign(static_cast<const char16*>(::GlobalLock(data)));
+ result->assign(static_cast<const base::char16*>(::GlobalLock(data)));
::GlobalUnlock(data);
}
@@ -632,7 +632,7 @@ void Clipboard::ReadBookmark(base::string16* title, std::string* url) const {
if (!data)
return;
- base::string16 bookmark(static_cast<const char16*>(::GlobalLock(data)));
+ base::string16 bookmark(static_cast<const base::char16*>(::GlobalLock(data)));
::GlobalUnlock(data);
ParseBookmarkClipboardFormat(bookmark, title, url);
« no previous file with comments | « tools/gdb/gdb_chrome.py ('k') | ui/base/ime/chromeos/character_composer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698