diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 21:28:14 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-10 21:28:14 +0000 |
commit | c792594135cc099020fde19176325e5ae7218dc4 (patch) | |
tree | f0f01a989132bbf36311a9f94a23bd83b0d486ce /webkit | |
parent | d5f408c6c903cab98b1122f3613b12ffc68655d7 (diff) | |
download | chromium_src-c792594135cc099020fde19176325e5ae7218dc4.zip chromium_src-c792594135cc099020fde19176325e5ae7218dc4.tar.gz chromium_src-c792594135cc099020fde19176325e5ae7218dc4.tar.bz2 |
Switch a wstring to a string16.
This code is currently only used on Windows, so though the caller still
uses a wstring this compiles.
BUG=23581
TEST=compiles
Review URL: http://codereview.chromium.org/6167003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl.h | 2 | ||||
-rw-r--r-- | webkit/plugins/npapi/webplugin_delegate_impl_win.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h index 6937fe7..84131f2 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl.h +++ b/webkit/plugins/npapi/webplugin_delegate_impl.h @@ -85,7 +85,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate { static bool IsPluginDelegateWindow(gfx::NativeWindow window); static bool GetPluginNameFromWindow(gfx::NativeWindow window, - std::wstring *plugin_name); + string16* plugin_name); // Returns true if the window handle passed in is that of the dummy // activation window for windowless plugins. diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc index 4739a9c..70e32a1 100644 --- a/webkit/plugins/npapi/webplugin_delegate_impl_win.cc +++ b/webkit/plugins/npapi/webplugin_delegate_impl_win.cc @@ -191,8 +191,9 @@ bool WebPluginDelegateImpl::IsPluginDelegateWindow(HWND window) { return wcscmp(class_name, kNativeWindowClassName) == 0; } +// static bool WebPluginDelegateImpl::GetPluginNameFromWindow( - HWND window, std::wstring *plugin_name) { + HWND window, string16* plugin_name) { if (NULL == plugin_name) { return false; } |