ash/system/web_notification/web_notification_tray.cc - Issue 22291003: ash:Shelf Update Alternate Layout

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: ash/system/web_notification/web_notification_tray.cc

Issue 22291003: ash:Shelf Update Alternate Layout (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 4 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: ash/system/web_notification/web_notification_tray.cc

diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc

index e59b24127973c2900f52fb1674e4fb89f41c649d..03be8b17650d3ccd4b780d7cff9f4b037d26d92e 100644

--- a/ash/system/web_notification/web_notification_tray.cc

+++ b/ash/system/web_notification/web_notification_tray.cc

@@ -330,7 +330,9 @@ bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {

NOTREACHED();

}

- message_center_bubble->SetMaxHeight(std::max(0, max_height - kTraySpacing));

+ int spacing = ash::switches::UseAlternateShelfLayout() ?

+ kAlternateTraySpacing : kTraySpacing;

+ message_center_bubble->SetMaxHeight(std::max(0, max_height - spacing));

if (show_settings)

message_center_bubble->SetSettingsVisible();

message_center_bubble_.reset(