chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc - Issue 1972033002: Simplify some old avatar menu button code.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

Issue 1972033002: Simplify some old avatar menu button code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: reinstate ash browser test fix Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_browsertest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

index 5752a3df4a18e7206f9f8a71eafb3ff0a20bdf97..d277fd071a08a78f905220deba1bf2b67fb839f4 100644

--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

@@ -28,7 +28,7 @@

#include "chrome/browser/profiles/profile_avatar_icon_util.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"

#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_test.h"

-#include "chrome/browser/ui/views/profiles/avatar_menu_button.h"

+#include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"

#include "components/signin/core/account_id/account_id.h"

#endif // defined(OS_CHROMEOS)

@@ -237,8 +237,9 @@ IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest,

manager->ShowWindowForUser(window, account_id2);

EXPECT_TRUE(chrome::MultiUserWindowManager::ShouldShowAvatar(window));

- // Avatar should show on the top left corner of the teleported browser window.

- EXPECT_TRUE(frame_view->avatar_button());

+ // An icon should show on the top left corner of the teleported browser

+ // window.

+ EXPECT_TRUE(frame_view->profile_indicator_icon());

}

// Hit Test for Avatar Menu Button on ChromeOS.