summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_tests.gypi
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 22:18:12 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-20 22:18:12 +0000
commit16d7415f2d746d7e41d03a97f93438e5cb467c9b (patch)
tree64b96ca10039d62ae511337edf2f787444f76ba5 /chrome/chrome_tests.gypi
parentd1ec3f7f30d07132bf0f75e4938d50a508bc7637 (diff)
downloadchromium_src-16d7415f2d746d7e41d03a97f93438e5cb467c9b.zip
chromium_src-16d7415f2d746d7e41d03a97f93438e5cb467c9b.tar.gz
chromium_src-16d7415f2d746d7e41d03a97f93438e5cb467c9b.tar.bz2
Revert 224495 "Manually landing already reviewed https://coderev..."
Broke Linux ChromiumOS Tests : http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/33127 > 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 TBR=zelidrag@chromium.org Review URL: https://codereview.chromium.org/23497007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224505 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_tests.gypi')
-rw-r--r--chrome/chrome_tests.gypi2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 06d5696..592e6d6 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1241,8 +1241,8 @@
'browser/printing/print_preview_dialog_controller_browsertest.cc',
'browser/printing/printing_layout_browsertest.cc',
'browser/process_singleton_browsertest.cc',
+ 'browser/profiles/avatar_menu_model_browsertest.cc',
'browser/profiles/profile_browsertest.cc',
- 'browser/profiles/profile_list_desktop_browsertest.cc',
'browser/profiles/profile_manager_browsertest.cc',
'browser/profile_resetter/profile_resetter_browsertest.cc',
'browser/referrer_policy_browsertest.cc',