diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 19:40:48 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-15 19:40:48 +0000 |
| commit | 162b5998f0e5caa333d9f348207b7f5a649f8eac (patch) | |
| tree | 7dfa4be96d7f361e6185c1430f49b919afc08805 /chrome/browser/shell_integration_win.cc | |
| parent | e36fd81da9e64f3c373cdf45d195d6d402d4b2c0 (diff) | |
| download | chromium_src-162b5998f0e5caa333d9f348207b7f5a649f8eac.zip chromium_src-162b5998f0e5caa333d9f348207b7f5a649f8eac.tar.gz chromium_src-162b5998f0e5caa333d9f348207b7f5a649f8eac.tar.bz2 | |
wstring: remove a needless wchar_t that is ASCII
While I'm at it, remove kNotSignedInID. This was added in 2007 (!)
and appears to be unused.
BUG=76112
Review URL: http://codereview.chromium.org/6695004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration_win.cc')
| -rw-r--r-- | chrome/browser/shell_integration_win.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc index ddfa8dd..0b9c32e 100644 --- a/chrome/browser/shell_integration_win.cc +++ b/chrome/browser/shell_integration_win.cc @@ -48,8 +48,10 @@ std::wstring GetProfileIdFromPath(const FilePath& profile_path) { // dir and is the default profile. if (chrome::GetDefaultUserDataDirectory(&default_user_data_dir) && profile_path.DirName() == default_user_data_dir && - profile_path.BaseName().value() == chrome::kNotSignedInProfile) + profile_path.BaseName().value() == + ASCIIToUTF16(chrome::kNotSignedInProfile)) { return std::wstring(); + } // Get joined basenames of user data dir and profile. std::wstring basenames = profile_path.DirName().BaseName().value() + @@ -219,7 +221,7 @@ bool MigrateChromiumShortcutsTask::GetExpectedAppId( FilePath profile_path; if (command_line.HasSwitch(switches::kUserDataDir)) { profile_path = - command_line.GetSwitchValuePath(switches::kUserDataDir).Append( + command_line.GetSwitchValuePath(switches::kUserDataDir).AppendASCII( chrome::kNotSignedInProfile); } |