Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / test / shelf_view_test_api.cc

diff --git a/src/ash/test/shelf_view_test_api.cc b/src/ash/test/shelf_view_test_api.cc
index 2147ada..d190f95 100644 (file)
--- a/src/ash/test/shelf_view_test_api.cc
+++ b/src/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"
@@ -36,9 +37,8 @@ class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
 namespace ash {
 namespace test {
 
-ShelfViewTestAPI::ShelfViewTestAPI(internal::ShelfView* shelf_view)
-    : shelf_view_(shelf_view) {
-}
+ShelfViewTestAPI::ShelfViewTestAPI(ShelfView* shelf_view)
+    : shelf_view_(shelf_view) {}
 
 ShelfViewTestAPI::~ShelfViewTestAPI() {
 }
@@ -47,13 +47,12 @@ int ShelfViewTestAPI::GetButtonCount() {
   return shelf_view_->view_model_->view_size();
 }
 
-internal::ShelfButton* ShelfViewTestAPI::GetButton(int index) {
+ShelfButton* ShelfViewTestAPI::GetButton(int index) {
   // App list button is not a ShelfButton.
   if (shelf_view_->model_->items()[index].type == ash::TYPE_APP_LIST)
     return NULL;
 
-  return static_cast<internal::ShelfButton*>(
-      shelf_view_->view_model_->view_at(index));
+  return static_cast<ShelfButton*>(shelf_view_->view_model_->view_at(index));
 }
 
 int ShelfViewTestAPI::GetFirstVisibleIndex() {
@@ -99,7 +98,7 @@ void ShelfViewTestAPI::RunMessageLoopUntilAnimationsDone() {
   shelf_view_->bounds_animator_->RemoveObserver(observer.get());
 }
 
-internal::OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
+OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
   return shelf_view_->overflow_bubble_.get();
 }
 
@@ -108,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,