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

Unified Diff: chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser 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 | « no previous file | chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
diff --git a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
index 8ecbd8422d9a9d31cd33c1cace6746e52cf5b0aa..57f99b4ca85338c9ba4d4228132d97e02042da1c 100644
--- a/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
+++ b/chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc
@@ -190,7 +190,8 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgIsFormatAvailable(
clipboard->ReadData(
ui::Clipboard::GetPepperCustomDataFormatType(), &clipboard_data);
Pickle pickle(clipboard_data.data(), clipboard_data.size());
- available = IsFormatAvailableInPickle(UTF8ToUTF16(format_name), pickle);
+ available =
+ IsFormatAvailableInPickle(base::UTF8ToUTF16(format_name), pickle);
}
break;
}
@@ -219,7 +220,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgReadData(
clipboard->ReadText(type, &text);
if (!text.empty()) {
result = PP_OK;
- clipboard_string = UTF16ToUTF8(text);
+ clipboard_string = base::UTF16ToUTF8(text);
break;
}
}
@@ -244,7 +245,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgReadData(
uint32 fragment_end;
clipboard->ReadHTML(type, &html, &url, &fragment_start, &fragment_end);
result = PP_OK;
- clipboard_string = UTF16ToUTF8(
+ clipboard_string = base::UTF16ToUTF8(
html.substr(fragment_start, fragment_end - fragment_start));
break;
}
@@ -262,7 +263,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgReadData(
default: {
if (custom_formats_.IsFormatRegistered(format)) {
base::string16 format_name =
- UTF8ToUTF16(custom_formats_.GetFormatName(format));
+ base::UTF8ToUTF16(custom_formats_.GetFormatName(format));
std::string clipboard_data;
clipboard->ReadData(
ui::Clipboard::GetPepperCustomDataFormatType(), &clipboard_data);
@@ -314,10 +315,10 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData(
switch (formats[i]) {
case PP_FLASH_CLIPBOARD_FORMAT_PLAINTEXT:
- scw.WriteText(UTF8ToUTF16(data[i]));
+ scw.WriteText(base::UTF8ToUTF16(data[i]));
break;
case PP_FLASH_CLIPBOARD_FORMAT_HTML:
- scw.WriteHTML(UTF8ToUTF16(data[i]), std::string());
+ scw.WriteHTML(base::UTF8ToUTF16(data[i]), std::string());
break;
case PP_FLASH_CLIPBOARD_FORMAT_RTF:
scw.WriteRTF(data[i]);
@@ -328,7 +329,7 @@ int32_t PepperFlashClipboardMessageFilter::OnMsgWriteData(
default:
if (custom_formats_.IsFormatRegistered(formats[i])) {
std::string format_name = custom_formats_.GetFormatName(formats[i]);
- custom_data_map[UTF8ToUTF16(format_name)] = data[i];
+ custom_data_map[base::UTF8ToUTF16(format_name)] = data[i];
} else {
// Invalid format.
res = PP_ERROR_BADARGUMENT;
« no previous file with comments | « no previous file | chrome/browser/renderer_host/plugin_info_message_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698