summaryrefslogtreecommitdiffstats
path: root/chrome/plugin
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 16:33:46 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-08 16:33:46 +0000
commit804cde48896d38246761d0f543fd938657832bfa (patch)
tree190f201f88139e05bf35a50a673320dccb832308 /chrome/plugin
parent465faa29046328890a224677db522f1aece8cad0 (diff)
downloadchromium_src-804cde48896d38246761d0f543fd938657832bfa.zip
chromium_src-804cde48896d38246761d0f543fd938657832bfa.tar.gz
chromium_src-804cde48896d38246761d0f543fd938657832bfa.tar.bz2
Remove some ToWStringHack()s that are in Windows-only code.
BUG=69467 Review URL: http://codereview.chromium.org/6286156 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin')
-rw-r--r--chrome/plugin/chrome_plugin_host.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index 690bf05..fcef53c 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -428,6 +428,7 @@ int STDCALL CPB_GetBrowsingContextInfo(
void* buf, uint32 buf_size) {
CHECK(ChromePluginLib::IsPluginThread());
+#if defined(OS_WIN)
switch (type) {
case CPBROWSINGCONTEXT_DATA_DIR_PTR: {
if (buf_size < sizeof(char*))
@@ -437,7 +438,7 @@ int STDCALL CPB_GetBrowsingContextInfo(
GetSwitchValuePath(switches::kPluginDataDir);
DCHECK(!path.empty());
std::string retval = WideToUTF8(
- path.Append(chrome::kChromePluginDataDirname).ToWStringHack());
+ path.Append(chrome::kChromePluginDataDirname).value());
*static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, retval);
return CPERR_SUCCESS;
@@ -451,6 +452,10 @@ int STDCALL CPB_GetBrowsingContextInfo(
return CPERR_SUCCESS;
}
}
+#else
+ // TODO(aa): this code is only used by Gears, which we are removing.
+ NOTREACHED();
+#endif
return CPERR_FAILURE;
}