From f3660335f8c9a41721cd9fa0534ca9973face7b9 Mon Sep 17 00:00:00 2001 From: "zelidrag@chromium.org" Date: Fri, 20 Sep 2013 20:54:44 +0000 Subject: Revert 224461 "Manually landing already reviewed https://coderev..." > Manually landing already reviewed https://codereview.chromium.org/23876020/ on behalf of michaelpg@: > > Multiprofile avatar menu for ChromeOS users. > > This change affects ChromeOS when the multiple profiles flag is set. > If multiple user accounts have been logged in on a device, the avatar menu > will include a link to add a user to the session. Once some number of users > is added, the avatar menu will display all logged in users and allow the user > to switch to, or open, a browser window for a given profile. > > AvatarMenuModel moved to AvatarMenu, model and controller functions separated out into interfaces ProfileList and AvatarMenuActions. AvatarMenu instantiates components based on multi-profile flag and platform. ChromeOS version of ProfileList uses the UserManager to identify logged-in users and translate them into their corresponding profiles. > > BUG=288365 > TEST=manual, added /chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc > TBR=ben,erg,dpolukhin,xiyuan,michaelpg > > Review URL: https://codereview.chromium.org/23503085 TBR=zelidrag@chromium.org Review URL: https://codereview.chromium.org/23593011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224481 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/browser_command_controller.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/ui/browser_command_controller.cc') diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index 2afe9be..fea6d8d 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/lifetime/application_lifetime.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" -#include "chrome/browser/profiles/avatar_menu.h" +#include "chrome/browser/profiles/avatar_menu_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sessions/tab_restore_service.h" @@ -1194,7 +1194,7 @@ void BrowserCommandController::UpdateCommandsForMultipleProfiles() { bool enable = IsShowingMainUI() && !profile()->IsOffTheRecord() && profile_manager_ && - AvatarMenu::ShouldShowAvatarMenu(); + AvatarMenuModel::ShouldShowAvatarMenu(); command_updater_.UpdateCommandEnabled(IDC_SHOW_AVATAR_MENU, enable); } -- cgit v1.1