summaryrefslogtreecommitdiffstats
path: root/chrome/browser/shell_integration.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 19:03:13 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 19:03:13 +0000
commit01ed196b68335e6e3e90abc2aed6df3d4b71132b (patch)
tree10fd22167916906d8dd9e9c3114cf9bf8d1aca2b /chrome/browser/shell_integration.cc
parent2ea3ca3156bddfb88b29094f6bb45c0aafa773c3 (diff)
downloadchromium_src-01ed196b68335e6e3e90abc2aed6df3d4b71132b.zip
chromium_src-01ed196b68335e6e3e90abc2aed6df3d4b71132b.tar.gz
chromium_src-01ed196b68335e6e3e90abc2aed6df3d4b71132b.tar.bz2
Extension ids are ASCII.
This is preliminary cleanup for a larger change. Review URL: http://codereview.chromium.org/6613032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76941 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration.cc')
-rw-r--r--chrome/browser/shell_integration.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index a20814b..cb5fde3 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -25,7 +25,7 @@ ShellIntegration::ShortcutInfo::~ShortcutInfo() {}
std::string ShellIntegration::GetCommandLineArgumentsCommon(
const GURL& url,
- const string16& extension_app_id) {
+ const std::string& extension_app_id) {
const CommandLine cmd = *CommandLine::ForCurrentProcess();
std::wstring arguments_w;
@@ -55,7 +55,7 @@ std::string ShellIntegration::GetCommandLineArgumentsCommon(
// during launch.
if (!extension_app_id.empty()) {
arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) +
- L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id)) + L"\"";
+ L"=\"" + ASCIIToWide(extension_app_id) + L"\"";
} else {
// Use '--app=url' instead of just 'url' to launch the browser with minimal
// chrome.