diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 21:03:58 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-09 21:03:58 +0000 |
commit | 777d59083eaaa3649903c87fe1f9b79b1e113c2b (patch) | |
tree | c1493f35081f8eb5430efdf982b1ab0019355dc1 /chrome/common/chrome_plugin_util.cc | |
parent | 47e4c8793c51d873957c3b6329d020c99f83d1d7 (diff) | |
download | chromium_src-777d59083eaaa3649903c87fe1f9b79b1e113c2b.zip chromium_src-777d59083eaaa3649903c87fe1f9b79b1e113c2b.tar.gz chromium_src-777d59083eaaa3649903c87fe1f9b79b1e113c2b.tar.bz2 |
Revert "Remove deprecated AbsolutePath function."
This reverts commit r28593. Random guess at build breakage.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28596 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_plugin_util.cc')
-rw-r--r-- | chrome/common/chrome_plugin_util.cc | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/chrome/common/chrome_plugin_util.cc b/chrome/common/chrome_plugin_util.cc index 405d885..9258d98 100644 --- a/chrome/common/chrome_plugin_util.cc +++ b/chrome/common/chrome_plugin_util.cc @@ -127,15 +127,13 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url, std::wstring arguments_w; // Use the same UserDataDir for new launches that we currently have set. - FilePath user_data_dir = FilePath::FromWStringHack( - cmd.GetSwitchValue(switches::kUserDataDir)); - if (!user_data_dir.value().empty()) { + std::wstring user_data_dir = cmd.GetSwitchValue(switches::kUserDataDir); + if (!user_data_dir.empty()) { // Make sure user_data_dir is an absolute path. if (file_util::AbsolutePath(&user_data_dir) && file_util::PathExists(user_data_dir)) { - arguments_w += CommandLine::PrefixedSwitchStringWithValue( - switches::kUserDataDir, - user_data_dir.ToWStringHack()) + L" "; + arguments_w += std::wstring(L"--") + switches::kUserDataDir + + L"=\"" + user_data_dir + L"\" "; } } @@ -148,8 +146,7 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url, ReplaceSubstringsAfterOffset(&url_string, 0, ";", ""); ReplaceSubstringsAfterOffset(&url_string, 0, "$", ""); std::wstring url_w = UTF8ToWide(url_string); - arguments_w += - CommandLine::PrefixedSwitchStringWithValue(switches::kApp, url_w); + arguments_w += std::wstring(L"--") + switches::kApp + L"=\"" + url_w + L"\""; *arguments = WideToUTF8(arguments_w); |