Index: chrome/browser/profiles/profiles_state.cc |
diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles/profiles_state.cc |
index 72e1295ba80e644965d4b3253b4d2113aba6143d..316527136fc45b5437196ce901e6b8507bd94d96 100644 |
--- a/chrome/browser/profiles/profiles_state.cc |
+++ b/chrome/browser/profiles/profiles_state.cc |
@@ -7,9 +7,16 @@ |
#include "base/command_line.h" |
#include "base/files/file_path.h" |
#include "base/prefs/pref_registry_simple.h" |
+#include "chrome/browser/browser_process.h" |
+#include "chrome/browser/profiles/profile.h" |
+#include "chrome/browser/profiles/profile_info_cache.h" |
+#include "chrome/browser/profiles/profile_manager.h" |
+#include "chrome/browser/ui/browser.h" |
#include "chrome/common/chrome_constants.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/pref_names.h" |
+#include "grit/generated_resources.h" |
+#include "ui/base/l10n/l10n_util.h" |
#if defined(OS_CHROMEOS) |
#include "chrome/browser/chromeos/login/user_manager.h" |
@@ -33,8 +40,7 @@ bool IsNewProfileManagementEnabled() { |
switches::kNewProfileManagement); |
} |
-base::FilePath GetDefaultProfileDir( |
- const base::FilePath& user_data_dir) { |
+base::FilePath GetDefaultProfileDir(const base::FilePath& user_data_dir) { |
base::FilePath default_profile_dir(user_data_dir); |
default_profile_dir = |
default_profile_dir.AppendASCII(chrome::kInitialProfile); |
@@ -54,4 +60,20 @@ void RegisterPrefs(PrefRegistrySimple* registry) { |
registry->RegisterListPref(prefs::kProfilesLastActive); |
} |
+string16 GetActiveProfileDisplayName(Browser* browser) { |
+ string16 profile_name; |
+ Profile* profile = browser->profile(); |
+ |
+ if (profile->IsGuestSession()) { |
+ profile_name = l10n_util::GetStringUTF16(IDS_GUEST_PROFILE_NAME); |
+ } else { |
+ ProfileInfoCache& cache = |
+ g_browser_process->profile_manager()->GetProfileInfoCache(); |
+ size_t index = cache.GetIndexOfProfileWithPath(profile->GetPath()); |
+ if (index != std::string::npos) |
+ profile_name = cache.GetNameOfProfileAtIndex(index); |
+ } |
+ return profile_name; |
+} |
+ |
} // namespace profiles |