From c792594135cc099020fde19176325e5ae7218dc4 Mon Sep 17 00:00:00 2001 From: "evan@chromium.org" Date: Mon, 10 Jan 2011 21:28:14 +0000 Subject: 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 --- webkit/plugins/npapi/webplugin_delegate_impl.h | 2 +- webkit/plugins/npapi/webplugin_delegate_impl_win.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'webkit') 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; } -- cgit v1.1