diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 21:56:50 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-04 21:56:50 +0000 |
| commit | 8b9765e56dfddf33374bfc14dcc5f9c954d60cdd (patch) | |
| tree | e8b1aa0c020e15def6e7a7f5d75cd017b5cd42da /chrome/browser/chrome_plugin_host.cc | |
| parent | 168e3b1aa94a24810d0cdce4555be19fe009174e (diff) | |
| download | chromium_src-8b9765e56dfddf33374bfc14dcc5f9c954d60cdd.zip chromium_src-8b9765e56dfddf33374bfc14dcc5f9c954d60cdd.tar.gz chromium_src-8b9765e56dfddf33374bfc14dcc5f9c954d60cdd.tar.bz2 | |
Revert "Remove a ToWStringHack() from Gears code."
This reverts commit r73846.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73848 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_plugin_host.cc')
| -rw-r--r-- | chrome/browser/chrome_plugin_host.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/chrome_plugin_host.cc b/chrome/browser/chrome_plugin_host.cc index 3eee1d5..fc7b9ce 100644 --- a/chrome/browser/chrome_plugin_host.cc +++ b/chrome/browser/chrome_plugin_host.cc @@ -464,14 +464,8 @@ int STDCALL CPB_GetBrowsingContextInfo( if (!service) return CPERR_FAILURE; FilePath path = service->GetChromePluginDataDir(); - // This is wrong -- we can't in general stuff a path through a std::string. - // But this code is Gears-specific, so Windows-only anyway for now. -#if defined(OS_WIN) std::string retval = WideToUTF8( - path.Append(chrome::kChromePluginDataDirname).value()); -#else - NOTREACHED(); -#endif + path.Append(chrome::kChromePluginDataDirname).ToWStringHack()); *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, retval); return CPERR_SUCCESS; } |