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

Unified Diff: content/common/plugin_list_win.cc

Issue 176843022: Move UTF16ToASCII, remove WideToASCII. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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 | « content/common/pepper_plugin_list.cc ('k') | content/public/common/webplugininfo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/plugin_list_win.cc
diff --git a/content/common/plugin_list_win.cc b/content/common/plugin_list_win.cc
index 3afe1abed6600122b30942489c0e4fc99ff633e4..dfc17114d20ff6d3293858ed13e0d2999daee099 100644
--- a/content/common/plugin_list_win.cc
+++ b/content/common/plugin_list_win.cc
@@ -16,6 +16,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/win/pe_image.h"
#include "base/win/registry.h"
#include "base/win/scoped_handle.h"
@@ -284,8 +285,8 @@ bool PluginList::ReadWebPluginInfo(const base::FilePath& filename,
// TODO(evan): Move the ParseMimeTypes code inline once Pepper is updated.
if (!PluginList::ParseMimeTypes(
- UTF16ToASCII(version_info_win->GetStringValue(L"MIMEType")),
- UTF16ToASCII(version_info_win->GetStringValue(L"FileExtents")),
+ base::UTF16ToASCII(version_info_win->GetStringValue(L"MIMEType")),
+ base::UTF16ToASCII(version_info_win->GetStringValue(L"FileExtents")),
version_info_win->GetStringValue(L"FileOpenName"),
&info->mime_types)) {
LOG_IF(ERROR, PluginList::DebugPluginLoading())
« no previous file with comments | « content/common/pepper_plugin_list.cc ('k') | content/public/common/webplugininfo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698