From 0ac231118b5ffa2ca76423c1ecc10ca47327596f Mon Sep 17 00:00:00 2001 From: "harrym@chromium.org" Date: Sat, 12 Apr 2014 02:57:56 +0000 Subject: 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 --- ash/test/shelf_view_test_api.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ash/test/shelf_view_test_api.cc') 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, -- cgit v1.1