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

Unified Diff: chrome/browser/ui/profile_menu_model.cc

Issue 7648037: [Mac] Flip the flag for multi-profiles to on by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Un-needed includes Created 9 years, 4 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
Index: chrome/browser/ui/profile_menu_model.cc
diff --git a/chrome/browser/ui/profile_menu_model.cc b/chrome/browser/ui/profile_menu_model.cc
index d33efbc2c33241e944c2b59ec69e6843182e7552..8a9c3dddc6a81d8a133f431092e90ff566601cd1 100644
--- a/chrome/browser/ui/profile_menu_model.cc
+++ b/chrome/browser/ui/profile_menu_model.cc
@@ -64,8 +64,8 @@ SwitchProfileMenuModel::SwitchProfileMenuModel(
: SimpleMenuModel(this),
browser_(browser),
delegate_(delegate) {
- ProfileInfoCache& cache =
- g_browser_process->profile_manager()->GetProfileInfoCache();
+ ProfileInfoInterface& cache =
+ g_browser_process->profile_manager()->GetProfileInfo();
size_t count = cache.GetNumberOfProfiles();
for (size_t i = 0; i < count; ++i) {
AddCheckItem(ProfileMenuModel::COMMAND_SWITCH_TO_PROFILE + i,
@@ -79,8 +79,8 @@ SwitchProfileMenuModel::SwitchProfileMenuModel(
}
void SwitchProfileMenuModel::ExecuteCommand(int command_id) {
- ProfileInfoCache& cache =
- g_browser_process->profile_manager()->GetProfileInfoCache();
+ ProfileInfoInterface& cache =
+ g_browser_process->profile_manager()->GetProfileInfo();
if (IsSwitchProfileCommand(command_id)) {
size_t index = GetProfileIndexFromSwitchProfileCommand(command_id);
FilePath profile_path = cache.GetPathOfProfileAtIndex(index);
@@ -94,8 +94,8 @@ void SwitchProfileMenuModel::ExecuteCommand(int command_id) {
}
bool SwitchProfileMenuModel::IsCommandIdChecked(int command_id) const {
- ProfileInfoCache& cache =
- g_browser_process->profile_manager()->GetProfileInfoCache();
+ ProfileInfoInterface& cache =
+ g_browser_process->profile_manager()->GetProfileInfo();
if (IsSwitchProfileCommand(command_id)) {
size_t index = GetProfileIndexFromSwitchProfileCommand(command_id);
FilePath userDataFolder;
@@ -135,8 +135,8 @@ size_t SwitchProfileMenuModel::GetProfileIndexFromSwitchProfileCommand(
ProfileMenuModel::ProfileMenuModel(Browser* browser)
: ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
browser_(browser) {
- ProfileInfoCache& cache =
- g_browser_process->profile_manager()->GetProfileInfoCache();
+ ProfileInfoInterface& cache =
+ g_browser_process->profile_manager()->GetProfileInfo();
size_t profile_index = cache.GetIndexOfProfileWithPath(
browser_->profile()->GetPath());
AddItem(COMMAND_PROFILE_NAME, cache.GetNameOfProfileAtIndex(profile_index));

Powered by Google App Engine
This is Rietveld 408576698