chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc - Issue 200483004: Show avatar icon on V2 app's frame

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.cc

Issue 200483004: Show avatar icon on V2 app's frame (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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:

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

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

index c4fc2e806c9b22fe09cd2b72a80922ac94bbb360..addf06e0d0d2c8ccda8d327778a0ecad6460b4fd 100644

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

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

@@ -401,7 +401,10 @@ bool BrowserNonClientFrameViewAsh::UsePackagedAppHeaderStyle() const {

void BrowserNonClientFrameViewAsh::LayoutAvatar() {

DCHECK(avatar_button());

+#if !defined(OS_CHROMEOS)

+ // ChromeOS shows avatar on V1 app.

DCHECK(browser_view()->IsTabStripVisible());

+#endif

gfx::ImageSkia incognito_icon = browser_view()->GetOTRAvatarIcon();

int avatar_bottom = GetTopInset() +