summaryrefslogtreecommitdiffstats
path: root/chrome/browser/web_applications
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/web_applications
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/web_applications')
-rw-r--r--chrome/browser/web_applications/web_app.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 099046ca..2e77928 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -94,7 +94,7 @@ FilePath GetSanitizedFileName(const string16& name) {
FilePath GetWebAppDir(const ShellIntegration::ShortcutInfo& info) {
if (!info.extension_id.empty()) {
std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
- UTF16ToUTF8(info.extension_id));
+ info.extension_id);
#if defined(OS_WIN)
return FilePath(UTF8ToWide(app_name));
#elif defined(OS_POSIX)
@@ -391,7 +391,7 @@ bool CreateShortcutTask::CreateShortcut() {
std::string app_name;
if (!shortcut_info_.extension_id.empty()) {
app_name = web_app::GenerateApplicationNameFromExtensionId(
- UTF16ToUTF8(shortcut_info_.extension_id));
+ shortcut_info_.extension_id);
} else {
app_name = web_app::GenerateApplicationNameFromURL(
shortcut_info_.url);