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

Unified Diff: content/browser/web_contents/web_contents_view_aura.cc

Issue 121033002: Update uses of UTF conversions in content/ 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
Index: content/browser/web_contents/web_contents_view_aura.cc
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
index 685f5b1071c3f51c96426dae7c781024a2f283ba..e4ef8c0f559455bbfdf3039cdfd5d6aae1122b9b 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -281,8 +281,9 @@ void PrepareDragData(const DropData& drop_data,
it != drop_data.filenames.end(); ++it) {
filenames.push_back(
ui::OSExchangeData::FileInfo(
- base::FilePath::FromUTF8Unsafe(UTF16ToUTF8(it->path)),
- base::FilePath::FromUTF8Unsafe(UTF16ToUTF8(it->display_name))));
+ base::FilePath::FromUTF8Unsafe(base::UTF16ToUTF8(it->path)),
+ base::FilePath::FromUTF8Unsafe(
+ base::UTF16ToUTF8(it->display_name))));
}
provider->SetFilenames(filenames);
}
@@ -323,8 +324,8 @@ void PrepareDropData(DropData* drop_data, const ui::OSExchangeData& data) {
it = files.begin(); it != files.end(); ++it) {
drop_data->filenames.push_back(
DropData::FileInfo(
- UTF8ToUTF16(it->path.AsUTF8Unsafe()),
- UTF8ToUTF16(it->display_name.AsUTF8Unsafe())));
+ base::UTF8ToUTF16(it->path.AsUTF8Unsafe()),
+ base::UTF8ToUTF16(it->display_name.AsUTF8Unsafe())));
}
}

Powered by Google App Engine
This is Rietveld 408576698