summaryrefslogtreecommitdiffstats
path: root/chrome/common/chrome_plugin_util.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 02:07:25 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-13 02:07:25 +0000
commitb7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78 (patch)
treed723b8556ad386a0b8a6e999e3a842e0bfe6f9b0 /chrome/common/chrome_plugin_util.cc
parent1976d41ac728fcceb30f2df3c243cb7417f538f1 (diff)
downloadchromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.zip
chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.gz
chromium_src-b7e0a2a3ccf5aceb891d5e1dfaf9db1bbaaa5f78.tar.bz2
Use ASCII strings for switch names.
Review URL: http://codereview.chromium.org/270062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28779 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_plugin_util.cc')
-rw-r--r--chrome/common/chrome_plugin_util.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/common/chrome_plugin_util.cc b/chrome/common/chrome_plugin_util.cc
index 9258d98..809e4e6 100644
--- a/chrome/common/chrome_plugin_util.cc
+++ b/chrome/common/chrome_plugin_util.cc
@@ -132,7 +132,8 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url,
// Make sure user_data_dir is an absolute path.
if (file_util::AbsolutePath(&user_data_dir) &&
file_util::PathExists(user_data_dir)) {
- arguments_w += std::wstring(L"--") + switches::kUserDataDir +
+ // TODO(evanm): use CommandLine APIs instead of this.
+ arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kUserDataDir) +
L"=\"" + user_data_dir + L"\" ";
}
}
@@ -146,7 +147,9 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url,
ReplaceSubstringsAfterOffset(&url_string, 0, ";", "");
ReplaceSubstringsAfterOffset(&url_string, 0, "$", "");
std::wstring url_w = UTF8ToWide(url_string);
- arguments_w += std::wstring(L"--") + switches::kApp + L"=\"" + url_w + L"\"";
+ // TODO(evanm): use CommandLine APIs instead of this.
+ arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kApp) +
+ L"=\"" + url_w + L"\"";
*arguments = WideToUTF8(arguments_w);