diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 23:10:20 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 23:10:20 +0000 |
| commit | 32e8a8c7efad4eb98469eaff908d18f9ef42ef92 (patch) | |
| tree | 5f2915fc9050a179a37f208af46237b7a8eb54b7 /chrome/browser/ui/gtk/avatar_menu_item_gtk.h | |
| parent | b699280919e2361cdbc2028a97f864cb2612df1c (diff) | |
| download | chromium_src-32e8a8c7efad4eb98469eaff908d18f9ef42ef92.zip chromium_src-32e8a8c7efad4eb98469eaff908d18f9ef42ef92.tar.gz chromium_src-32e8a8c7efad4eb98469eaff908d18f9ef42ef92.tar.bz2 | |
Reland 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.
Original review: https://codereview.chromium.org/23876020/
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/24190003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/avatar_menu_item_gtk.h')
| -rw-r--r-- | chrome/browser/ui/gtk/avatar_menu_item_gtk.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.h b/chrome/browser/ui/gtk/avatar_menu_item_gtk.h index 5fe6655..058e134 100644 --- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.h +++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.h @@ -7,7 +7,7 @@ #include <gtk/gtk.h> -#include "chrome/browser/profiles/avatar_menu_model.h" +#include "chrome/browser/profiles/avatar_menu.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ui/base/gtk/gtk_signal.h" @@ -32,7 +32,7 @@ class AvatarMenuItemGtk : public content::NotificationObserver { }; AvatarMenuItemGtk(Delegate* delegate, - const AvatarMenuModel::Item& item, + const AvatarMenu::Item& item, size_t item_index, GtkThemeService* theme_service); virtual ~AvatarMenuItemGtk(); @@ -73,7 +73,7 @@ class AvatarMenuItemGtk : public content::NotificationObserver { Delegate* delegate_; // Profile information to display for this item, e.g. user name, sync status. - AvatarMenuModel::Item item_; + AvatarMenu::Item item_; // The index of this profile. The delegate uses this value to distinguish // which profile should be switched to. |