diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 00:47:19 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-01 00:47:19 +0000 |
| commit | ceee6467a02eb86759d062233f38e94330c1105f (patch) | |
| tree | bccd96b413d8530cae2273c7da8b6dcf50689daf /ash/test | |
| parent | caa053509a9a8bf6a985abe5747b0acf3bade7d0 (diff) | |
| download | chromium_src-ceee6467a02eb86759d062233f38e94330c1105f.zip chromium_src-ceee6467a02eb86759d062233f38e94330c1105f.tar.gz chromium_src-ceee6467a02eb86759d062233f38e94330c1105f.tar.bz2 | |
Part 1) of cleaning up the code related to the shelf layout, specifically removing all instances of branching related to the 'alternate shelf layout' as this is now the only option.
Removed the about:flags entry relating to alternate shelf layout.
A patch will follow to simplify the remaining layout code as it is still a bit of a spaghetti like mess.
R=jamescook@chromium.org, skuhne@chromium.org
TBR=miket@chromium.org
BUG=338429
Review URL: https://codereview.chromium.org/140323010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test')
| -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 2147ada..1b4e453 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" @@ -108,11 +109,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, |