diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 02:57:56 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 02:57:56 +0000 |
| commit | 0ac231118b5ffa2ca76423c1ecc10ca47327596f (patch) | |
| tree | fd7503398048811b348ea3b820e7600ada9946f3 /ash/test/shelf_view_test_api.cc | |
| parent | 7177c4325ff6804e53ae62399a48e7af7b04abec (diff) | |
| download | chromium_src-0ac231118b5ffa2ca76423c1ecc10ca47327596f.zip chromium_src-0ac231118b5ffa2ca76423c1ecc10ca47327596f.tar.gz chromium_src-0ac231118b5ffa2ca76423c1ecc10ca47327596f.tar.bz2 | |
Shelf Cleanup AlternateShelfLayout P1 Attempt 3
R=skuhne@chromium.org
TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org
BUG=338429
re-landing of https://codereview.chromium.org/176883022/ with fix for the inset of app panel as discussed offline /w jennyz@
Review URL: https://codereview.chromium.org/229453005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/shelf_view_test_api.cc')
| -rw-r--r-- | ash/test/shelf_view_test_api.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc index d3d545c..d190f95 100644 --- a/ash/test/shelf_view_test_api.cc +++ b/ash/test/shelf_view_test_api.cc @@ -6,6 +6,7 @@ #include "ash/shelf/overflow_button.h" #include "ash/shelf/shelf_button.h" +#include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/shelf_view.h" #include "base/message_loop/message_loop.h" @@ -106,11 +107,11 @@ gfx::Size ShelfViewTestAPI::GetPreferredSize() { } int ShelfViewTestAPI::GetButtonSize() { - return shelf_view_->GetButtonSize(); + return kShelfButtonSize; } int ShelfViewTestAPI::GetButtonSpacing() { - return shelf_view_->GetButtonSpacing(); + return kShelfButtonSpacing; } bool ShelfViewTestAPI::SameDragType(ShelfItemType typea, |