summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/views/avatar_menu_button_browsertest.cc
diff options
context:
space:
mode:
authornoms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 08:56:38 +0000
committernoms@chromium.org <noms@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-17 08:56:38 +0000
commitee4379ebef30d92167b756092d9535351be3f036 (patch)
treec63ed201b8527951f90aefdb0f1497b58aba5638 /chrome/browser/ui/views/avatar_menu_button_browsertest.cc
parent3fe8d2f86756a06a49ceff42cc32879e5e63117e (diff)
downloadchromium_src-ee4379ebef30d92167b756092d9535351be3f036.zip
chromium_src-ee4379ebef30d92167b756092d9535351be3f036.tar.gz
chromium_src-ee4379ebef30d92167b756092d9535351be3f036.tar.bz2
Redesign of the avatar menu button.
Screenshots: https://drive.google.com/folderview?id=0B1B1Up4p2NRMYm8zRzFhQkpCTUE&usp=sharing This is behind the --new-profile-management flag, and shows the avatar switcher as a menu button in the caption area. The button shows the user's name, rather than an image. There will be an upcoming CL to ensure that the correct button is displayed for Metro (Win8) browsers (this CL would display the Aero button for Win8 as well). BUG=287883 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=228293 Review URL: https://codereview.chromium.org/24647003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/avatar_menu_button_browsertest.cc')
-rw-r--r--chrome/browser/ui/views/avatar_menu_button_browsertest.cc89
1 files changed, 6 insertions, 83 deletions
diff --git a/chrome/browser/ui/views/avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/avatar_menu_button_browsertest.cc
index a3c0125..02f5cb3 100644
--- a/chrome/browser/ui/views/avatar_menu_button_browsertest.cc
+++ b/chrome/browser/ui/views/avatar_menu_button_browsertest.cc
@@ -7,35 +7,24 @@
#include "base/command_line.h"
#include "base/path_service.h"
#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/profiles/avatar_menu.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/profiles/profiles_state.h"
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/views/avatar_menu_bubble_view.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/profile_chooser_view.h"
-#include "chrome/browser/ui/views/user_manager_view.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/test_switches.h"
#include "chrome/test/base/testing_browser_process.h"
-#include "content/public/test/test_utils.h"
#include "grit/generated_resources.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/views/controls/button/label_button.h"
-class AvatarMenuButtonTest : public InProcessBrowserTest,
- public testing::WithParamInterface<bool> {
+class AvatarMenuButtonTest : public InProcessBrowserTest {
public:
AvatarMenuButtonTest();
virtual ~AvatarMenuButtonTest();
protected:
- virtual void SetUp() OVERRIDE;
-
- bool UsingNewProfileChooser();
void CreateTestingProfile();
AvatarMenuButton* GetAvatarMenuButton();
void StartAvatarMenu();
@@ -50,33 +39,10 @@ AvatarMenuButtonTest::AvatarMenuButtonTest() {
AvatarMenuButtonTest::~AvatarMenuButtonTest() {
}
-void AvatarMenuButtonTest::SetUp() {
- if (GetParam()) {
- if (!UsingNewProfileChooser()) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
- }
- DCHECK(UsingNewProfileChooser());
- } else {
- DCHECK(!UsingNewProfileChooser());
- }
-
- InProcessBrowserTest::SetUp();
-}
-
-bool AvatarMenuButtonTest::UsingNewProfileChooser() {
- return CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kNewProfileManagement);
-}
-
void AvatarMenuButtonTest::CreateTestingProfile() {
ProfileManager* profile_manager = g_browser_process->profile_manager();
EXPECT_EQ(1u, profile_manager->GetNumberOfProfiles());
- // Sign in the default profile
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- cache.SetUserNameOfProfileAtIndex(0, UTF8ToUTF16("user_name"));
-
base::FilePath path;
PathService::Get(chrome::DIR_USER_DATA, &path);
path = path.AppendASCII("test_profile");
@@ -99,28 +65,25 @@ void AvatarMenuButtonTest::StartAvatarMenu() {
ASSERT_TRUE(button);
AvatarMenuBubbleView::set_close_on_deactivate(false);
- ProfileChooserView::set_close_on_deactivate(false);
static_cast<views::MenuButtonListener*>(button)->OnMenuButtonClicked(
NULL, gfx::Point());
base::MessageLoop::current()->RunUntilIdle();
- EXPECT_NE(AvatarMenuBubbleView::IsShowing(),
- ProfileChooserView::IsShowing());
+ EXPECT_TRUE(AvatarMenuBubbleView::IsShowing());
}
-IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, HideOnSecondClick) {
+IN_PROC_BROWSER_TEST_F(AvatarMenuButtonTest, HideOnSecondClick) {
#if defined(OS_WIN) && defined(USE_ASH)
// Disable this test in Metro+Ash for now (http://crbug.com/262796).
if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests))
return;
#endif
- if (!profiles::IsMultipleProfilesEnabled() ||
- UsingNewProfileChooser()) {
+ // If multiprofile mode is not enabled, you can't switch between profiles.
+ if (!profiles::IsMultipleProfilesEnabled())
return;
- }
CreateTestingProfile();
- StartAvatarMenu();
+ ASSERT_NO_FATAL_FAILURE(StartAvatarMenu());
// Verify that clicking again doesn't reshow it.
AvatarMenuButton* button = GetAvatarMenuButton();
@@ -131,44 +94,4 @@ IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, HideOnSecondClick) {
AvatarMenuBubbleView::Hide();
base::MessageLoop::current()->RunUntilIdle();
EXPECT_FALSE(AvatarMenuBubbleView::IsShowing());
- EXPECT_FALSE(ProfileChooserView::IsShowing());
-}
-
-IN_PROC_BROWSER_TEST_P(AvatarMenuButtonTest, NewSignOut) {
- if (!profiles::IsMultipleProfilesEnabled() ||
- !UsingNewProfileChooser()) {
- return;
- }
-
- CreateTestingProfile();
- StartAvatarMenu();
-
- BrowserList* browser_list =
- BrowserList::GetInstance(chrome::GetActiveDesktop());
- EXPECT_EQ(1U, browser_list->size());
- content::WindowedNotificationObserver window_close_observer(
- chrome::NOTIFICATION_BROWSER_CLOSED,
- content::Source<Browser>(browser()));
-
- AvatarMenu* menu =
- ProfileChooserView::profile_bubble_->avatar_menu_.get();
- const AvatarMenu::Item& menu_item_before =
- menu->GetItemAt(menu->GetActiveProfileIndex());
- EXPECT_FALSE(menu_item_before.signin_required);
-
- ui::MouseEvent mouse_ev(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), 0);
- menu->SetLogoutURL("about:blank");
-
- ProfileChooserView::profile_bubble_->LinkClicked(
- static_cast<views::Link*>(
- ProfileChooserView::profile_bubble_->signout_current_profile_link_),
- 0);
-
- EXPECT_TRUE(menu->GetItemAt(menu->GetActiveProfileIndex()).signin_required);
-
- window_close_observer.Wait(); // Rely on test timeout for failure indication.
- EXPECT_TRUE(browser_list->empty());
}
-
-INSTANTIATE_TEST_CASE_P(Old, AvatarMenuButtonTest, testing::Values(false));
-INSTANTIATE_TEST_CASE_P(New, AvatarMenuButtonTest, testing::Values(true));
generated by cgit v1.1 at 2025-04-04 07:29:58 +0000