ash/shelf/shelf_view.cc - Issue 1742953002: Simplify ash shelf layout 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: ash/shelf/shelf_view.cc

Issue 1742953002: Simplify ash shelf layout code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Restore ConvertRectToScreen calls. Created 4 years, 10 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/shelf/shelf_view.cc

diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc

index 876b90ab1c074d92421cec15221c35acdb46b695..262aed8f22bbb9e2db6d90717eb62daef31b15b7 100644

--- a/ash/shelf/shelf_view.cc

+++ b/ash/shelf/shelf_view.cc

@@ -1414,8 +1414,7 @@ gfx::Size ShelfView::GetPreferredSize() const {

if (shelf_->IsHorizontalAlignment())

return gfx::Size(last_button_bounds.right() + leading_inset_, kShelfSize);

- return gfx::Size(kShelfSize,

- last_button_bounds.bottom() + leading_inset_);

+ return gfx::Size(kShelfSize, last_button_bounds.bottom() + leading_inset_);

}

void ShelfView::OnBoundsChanged(const gfx::Rect& previous_bounds) {

« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/shelf/shelf_view_unittest.cc » ('j') | no next file with comments »