diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 15:29:49 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-07 15:29:49 +0000 |
| commit | 6b27db809e959efaf7183ea2de64c6ab3947ef3d (patch) | |
| tree | ed2ed10f826f6eb40884231ee0c98d86afef44a7 /webkit/port | |
| parent | 65b1094478e054ef1f924d3681f8d34ec88d9fcf (diff) | |
| download | chromium_src-6b27db809e959efaf7183ea2de64c6ab3947ef3d.zip chromium_src-6b27db809e959efaf7183ea2de64c6ab3947ef3d.tar.gz chromium_src-6b27db809e959efaf7183ea2de64c6ab3947ef3d.tar.bz2 | |
Remove the old NativeMB functions from string util, and use the new ones in sys_strings.h. I also removed duplicated code from the sandbox that can now use this, and fixed one case in the bug reporter that should not have been using the native multibyte encoding.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/bridge/PluginsWin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/webkit/port/bridge/PluginsWin.cpp b/webkit/port/bridge/PluginsWin.cpp index f1f837d..ef7572a 100644 --- a/webkit/port/bridge/PluginsWin.cpp +++ b/webkit/port/bridge/PluginsWin.cpp @@ -42,6 +42,7 @@ #include "base/file_util.h" #include "base/string_util.h" +#include "base/sys_string_conversions.h" #include "webkit/glue/plugins/plugin_list.h" #include "glue/glue_util.h" #include "glue/webkit_glue.h" @@ -111,7 +112,7 @@ bool PluginInfoStore::supportsMIMEType(const WebCore::String &mime_type) for (size_t j = 0; j < g_plugins[i].mime_types.size(); ++j) { if (net::MatchesMimeType( g_plugins[i].mime_types[j].mime_type, - WideToNativeMB(converted_mime_type))) { + base::SysWideToNativeMB(converted_mime_type))) { // Don't allow wildcard matches here as this will result in // plugins being instantiated in cases where they should not. // For e.g. clicking on a link which causes a file to be |