ash/shelf/shelf_view.cc - Issue 97983003: Start the move of launcher_types.h to shelf.

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 97983003: Start the move of launcher_types.h to shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: the rename Created 7 years 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 b339c2c8b1a98432342a2e6f4a77687930c035ca..67988af1e955644f50eb0e64ca22b988bf1c6bb8 100644

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

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

@@ -18,6 +18,7 @@

#include "ash/shelf/overflow_bubble_view.h"

#include "ash/shelf/overflow_button.h"

#include "ash/shelf/shelf_button.h"

+#include "ash/shelf/shelf_constants.h"

#include "ash/shelf/shelf_delegate.h"

#include "ash/shelf/shelf_icon_observer.h"

#include "ash/shelf/shelf_item_delegate.h"

@@ -1348,7 +1349,7 @@ void ShelfView::UpdateOverflowRange(ShelfView* overflow_view) {

int ShelfView::GetButtonSize() const {

return ash::switches::UseAlternateShelfLayout() ?

- kButtonSize : kLauncherPreferredSize;

+ kButtonSize : kShelfPreferredSize;

}

int ShelfView::GetButtonSpacing() const {

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