Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7408)

Unified Diff: chrome/browser/shell_integration_win.cc

Issue 6695004: wstring: remove a needless wchar_t that is ASCII (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/shell_integration_unittest.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « chrome/browser/shell_integration_unittest.cc ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698