Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / shelf / shelf_view.h

diff --git a/src/ash/shelf/shelf_view.h b/src/ash/shelf/shelf_view.h
index 6cd44e0..9f7c2dd 100644 (file)
--- a/src/ash/shelf/shelf_view.h
+++ b/src/ash/shelf/shelf_view.h
@@ -27,19 +27,11 @@ class ViewModel;
 }
 
 namespace ash {
-
-namespace test {
-class ShelfViewTestAPI;
-}
-
 class ShelfDelegate;
 class ShelfIconObserver;
 class ShelfItemDelegateManager;
 class ShelfModel;
 struct ShelfItem;
-
-namespace internal {
-
 class DragImageView;
 class OverflowBubble;
 class OverflowButton;
@@ -47,6 +39,10 @@ class ShelfButton;
 class ShelfLayoutManager;
 class ShelfTooltipManager;
 
+namespace test {
+class ShelfViewTestAPI;
+}
+
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT;
 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT;
@@ -235,11 +231,6 @@ class ASH_EXPORT ShelfView : public views::View,
   // Toggles the overflow menu.
   void ToggleOverflowBubble();
 
-  // Update first launcher button's padding. This method adds padding to the
-  // first button to include the leading inset. It needs to be called once on
-  // button creation and every time when shelf alignment is changed.
-  void UpdateFirstButtonPadding();
-
   // Invoked after the fading out animation for item deletion is ended.
   void OnFadeOutAnimationEnded();
 
@@ -249,12 +240,6 @@ class ASH_EXPORT ShelfView : public views::View,
   // Updates the visible range of overflow items in |overflow_view|.
   void UpdateOverflowRange(ShelfView* overflow_view);
 
-  // Returns the launcher button size.
-  int GetButtonSize() const;
-
-  // Returns the button spacing.
-  int GetButtonSpacing() const;
-
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
@@ -420,7 +405,7 @@ class ASH_EXPORT ShelfView : public views::View,
 
   // The image proxy for drag operations when a drag and drop host exists and
   // the item can be dragged outside the app grid.
-  scoped_ptr<ash::internal::DragImageView> drag_image_;
+  scoped_ptr<ash::DragImageView> drag_image_;
 
   // The cursor offset to the middle of the dragged item.
   gfx::Vector2d drag_image_offset_;
@@ -452,7 +437,6 @@ class ASH_EXPORT ShelfView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(ShelfView);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_VIEW_H_