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

Unified Diff: chrome/browser/profiles/profile_manager.cc

Issue 12090062: Enable profile switching for standalone App Launcher via the Settings App. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: disable tests on aura Created 7 years, 10 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/profiles/profile_manager.h ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_manager.cc
diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc
index 178b74f9d1b387434fff2e2fc50b25fec4f9cc63..811ddeb069ccb944e48db12b3a0a1d86b2c85330 100644
--- a/chrome/browser/profiles/profile_manager.cc
+++ b/chrome/browser/profiles/profile_manager.cc
@@ -315,17 +315,21 @@ Profile* ProfileManager::GetLastUsedProfile(const FilePath& user_data_dir) {
return GetDefaultProfile(user_data_dir);
#endif
+ return GetProfile(GetLastUsedProfileDir(user_data_dir));
+}
+
+FilePath ProfileManager::GetLastUsedProfileDir(const FilePath& user_data_dir) {
FilePath last_used_profile_dir(user_data_dir);
- std::string last_profile_used;
+ std::string last_used_profile;
PrefService* local_state = g_browser_process->local_state();
DCHECK(local_state);
- if (local_state->HasPrefPath(prefs::kProfileLastUsed))
- last_profile_used = local_state->GetString(prefs::kProfileLastUsed);
- last_used_profile_dir = last_profile_used.empty() ?
- last_used_profile_dir.AppendASCII(chrome::kInitialProfile) :
- last_used_profile_dir.AppendASCII(last_profile_used);
- return GetProfile(last_used_profile_dir);
+ if (local_state->HasPrefPath(prefs::kProfileLastUsed)) {
+ return last_used_profile_dir.AppendASCII(
+ local_state->GetString(prefs::kProfileLastUsed));
+ }
+
+ return last_used_profile_dir.AppendASCII(chrome::kInitialProfile);
}
std::vector<Profile*> ProfileManager::GetLastOpenedProfiles(
« no previous file with comments | « chrome/browser/profiles/profile_manager.h ('k') | chrome/browser/resources/options/browser_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698