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); |