Upstream version 9.38.198.0

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

diff --git a/src/ash/shelf/shelf_button.h b/src/ash/shelf/shelf_button.h
index b83f7f3..45d7174 100644 (file)
--- a/src/ash/shelf/shelf_button.h
+++ b/src/ash/shelf/shelf_button.h
@@ -11,8 +11,6 @@
 #include "ui/views/controls/image_view.h"
 
 namespace ash {
-namespace internal {
-
 class ShelfButtonHost;
 class ShelfLayoutManager;
 
@@ -84,9 +82,6 @@ class ASH_EXPORT ShelfButton : public views::CustomButton {
     void set_icon_size(int icon_size) { icon_size_ = icon_size; }
     int icon_size() const { return icon_size_; }
 
-    // views::View overrides.
-    virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
-
    private:
     // Set to non-zero to force icons to be resized to fit within a square,
     // while maintaining original proportions.
@@ -102,7 +97,7 @@ class ASH_EXPORT ShelfButton : public views::CustomButton {
   virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
@@ -154,7 +149,6 @@ class ASH_EXPORT ShelfButton : public views::CustomButton {
   DISALLOW_COPY_AND_ASSIGN(ShelfButton);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_BUTTON_H_