diff options
| author | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-30 14:49:41 +0000 |
|---|---|---|
| committer | jschuh@chromium.org <jschuh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-30 14:49:41 +0000 |
| commit | 790613cb3725005dda8f7fbfaa344a9e99a8f2a8 (patch) | |
| tree | ae12eb3387f2071762bc6f8e606c587b1b2a7c03 /chrome/common | |
| parent | 7ba0e1a08c29d56302158767dc6526ce798ce762 (diff) | |
| download | chromium_src-790613cb3725005dda8f7fbfaa344a9e99a8f2a8.zip chromium_src-790613cb3725005dda8f7fbfaa344a9e99a8f2a8.tar.gz chromium_src-790613cb3725005dda8f7fbfaa344a9e99a8f2a8.tar.bz2 | |
Replaces the % character with \x when generating Windows shortcuts via
File->"Create application shortcuts." The \x is converted back to % in
handling the --app switch.
BUG=23693
TEST=None
Review URL: http://codereview.chromium.org/515028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35377 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_plugin_util.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/common/chrome_plugin_util.cc b/chrome/common/chrome_plugin_util.cc index e3b0f40..128fe1b 100644 --- a/chrome/common/chrome_plugin_util.cc +++ b/chrome/common/chrome_plugin_util.cc @@ -150,10 +150,13 @@ CPError CPB_GetCommandLineArgumentsCommon(const char* url, // chrome. // Note: Do not change this flag! Old Gears shortcuts will break if you do! std::string url_string(url); - ReplaceSubstringsAfterOffset(&url_string, 0, "\"", "\\\""); - ReplaceSubstringsAfterOffset(&url_string, 0, "%", "%%"); - ReplaceSubstringsAfterOffset(&url_string, 0, ";", ""); - ReplaceSubstringsAfterOffset(&url_string, 0, "$", ""); + ReplaceSubstringsAfterOffset(&url_string, 0, "\\", "%5C"); + ReplaceSubstringsAfterOffset(&url_string, 0, "\"", "%22"); + ReplaceSubstringsAfterOffset(&url_string, 0, ";", "%3B"); + ReplaceSubstringsAfterOffset(&url_string, 0, "$", "%24"); +#if defined(OS_WIN) // Windows shortcuts can't escape % so we use \x instead. + ReplaceSubstringsAfterOffset(&url_string, 0, "%", "\\x"); +#endif std::wstring url_w = UTF8ToWide(url_string); // TODO(evanm): use CommandLine APIs instead of this. arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kApp) + |