summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser_chromeos.gypi
diff options
context:
space:
mode:
authorzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 21:23:38 +0000
committerzelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 21:23:38 +0000
commit5c1c6521fd2bc6b8c8451c02c729c8c0360c4189 (patch)
treea998e1ba4994a218f7d320e13e4db06048705fc4 /chrome/chrome_browser_chromeos.gypi
parent0aadf865b4c718474b12a7323a38dceca053793b (diff)
downloadchromium_src-5c1c6521fd2bc6b8c8451c02c729c8c0360c4189.zip
chromium_src-5c1c6521fd2bc6b8c8451c02c729c8c0360c4189.tar.gz
chromium_src-5c1c6521fd2bc6b8c8451c02c729c8c0360c4189.tar.bz2
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/24330003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224495 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser_chromeos.gypi')
-rw-r--r--chrome/chrome_browser_chromeos.gypi4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 9592392..27ac0dc 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -731,8 +731,12 @@
'browser/chromeos/preferences.h',
'browser/chromeos/prerender_condition_network.cc',
'browser/chromeos/prerender_condition_network.h',
+ 'browser/chromeos/profiles/avatar_menu_actions_chromeos.cc',
+ 'browser/chromeos/profiles/avatar_menu_actions_chromeos.h',
'browser/chromeos/profiles/profile_helper.cc',
'browser/chromeos/profiles/profile_helper.h',
+ 'browser/chromeos/profiles/profile_list_chromeos.cc',
+ 'browser/chromeos/profiles/profile_list_chromeos.h',
'browser/chromeos/profiles/profile_util.cc',
'browser/chromeos/profiles/profile_util.h',
'browser/chromeos/proxy_config_service_impl.cc',