| Index: chrome/browser/shell_integration_win.cc
|
| diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
|
| index ddfa8dd0aeda361d2e1b5cacecd0c515022fd80a..0b9c32e2f22eaa628d19b6a9b7a30e20868c0b23 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);
|
| }
|
|
|
|
|