diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-27 02:36:27 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-27 02:36:27 +0000 |
| commit | a62e721b4f6a5681bcd76a1715204017b1ef6861 (patch) | |
| tree | 7249d3b75cc537a49f7a757ab525727fae607de4 /ash/shelf/shelf_view.cc | |
| parent | 71accd2178fae1ab9b070c823c6f280788952425 (diff) | |
| download | chromium_src-a62e721b4f6a5681bcd76a1715204017b1ef6861.zip chromium_src-a62e721b4f6a5681bcd76a1715204017b1ef6861.tar.gz chromium_src-a62e721b4f6a5681bcd76a1715204017b1ef6861.tar.bz2 | |
Start the move of launcher_types.h to shelf.
I decided to split the constants into its own component to make the
transition easier to do and review.
BUG=248353
TEST=None, no functional changes
R=jamescook@chromium.org,harrym@chromium.org
TBR=tapted@chromium.org # for c/b/ui/apps
Review URL: https://codereview.chromium.org/97983003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242588 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_view.cc')
| -rw-r--r-- | ash/shelf/shelf_view.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc index b339c2c..67988af 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 { |