diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 03:02:51 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-11 03:02:51 +0000 |
| commit | 57ecc4bf4069cb869e5fb0a7d922eec2384bac25 (patch) | |
| tree | 1b4668fa59d6b6a072144b4ddab8d5f6faba3fa4 /chrome/browser/shell_integration_win.cc | |
| parent | 1af19cfd7b1ef9924516dbe811db495315feaefe (diff) | |
| download | chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.zip chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.tar.gz chromium_src-57ecc4bf4069cb869e5fb0a7d922eec2384bac25.tar.bz2 | |
Make prefs use std::string for keys rather than wstrings.
Much remains to be converted.
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3076037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55660 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_win.cc')
| -rw-r--r-- | chrome/browser/shell_integration_win.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index 469fcbd..46c05a9 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -17,6 +17,7 @@ #include "base/scoped_comptr_win.h" #include "base/string_util.h" #include "base/task.h" +#include "base/utf_string_conversions.h" #include "base/win_util.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/web_applications/web_app.h" @@ -224,8 +225,8 @@ bool MigrateChromiumShortcutsTask::GetExpectedAppId( std::wstring app_name; if (command_line.HasSwitch(switches::kApp)) { - app_name = web_app::GenerateApplicationNameFromURL( - GURL(command_line.GetSwitchValueASCII(switches::kApp))); + app_name = UTF8ToWide(web_app::GenerateApplicationNameFromURL( + GURL(command_line.GetSwitchValueASCII(switches::kApp)))); } else { app_name = BrowserDistribution::GetDistribution()->GetBrowserAppId(); } |