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

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

Issue 689063002: Cleanup: Replace base::ASCIIToWide with base::ASCIIToUTF16. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix typo Created 6 years, 1 month 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/imagediff/image_diff.cc ('k') | win8/delegate_execute/delegate_execute_util_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 f37f0772cadf2912f9c26ea0520d041e99e9cbb7..b46aba58bc05d6404f9632658330b68843c042a2 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -136,7 +136,7 @@ HGLOBAL CreateGlobalData(const std::basic_string<charT>& str) {
::GlobalUnlock(data);
}
return data;
-};
+}
bool BitmapHasInvalidPremultipliedColors(const SkBitmap& bitmap) {
for (int x = 0; x < bitmap.width(); ++x) {
@@ -238,7 +238,7 @@ bool Clipboard::FormatType::Equals(const FormatType& other) const {
Clipboard::FormatType Clipboard::GetFormatType(
const std::string& format_string) {
return FormatType(
- ::RegisterClipboardFormat(base::ASCIIToWide(format_string).c_str()));
+ ::RegisterClipboardFormat(base::ASCIIToUTF16(format_string).c_str()));
}
// static
@@ -727,7 +727,7 @@ void ClipboardWin::WriteBookmark(const char* title_data,
bookmark.append(1, L'\n');
bookmark.append(url_data, url_len);
- base::string16 wide_bookmark = base::UTF8ToWide(bookmark);
+ base::string16 wide_bookmark = base::UTF8ToUTF16(bookmark);
HGLOBAL glob = CreateGlobalData(wide_bookmark);
WriteToClipboard(GetUrlWFormatType().ToFormatEtc().cfFormat, glob);
« no previous file with comments | « tools/imagediff/image_diff.cc ('k') | win8/delegate_execute/delegate_execute_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698