Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / system / tray / hover_highlight_view.h

diff --git a/src/ash/system/tray/hover_highlight_view.h b/src/ash/system/tray/hover_highlight_view.h
index 0ca9358..0797de6 100644 (file)
--- a/src/ash/system/tray/hover_highlight_view.h
+++ b/src/ash/system/tray/hover_highlight_view.h
@@ -9,14 +9,13 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/text_constants.h"
 
 namespace views {
 class Label;
 }
 
 namespace ash {
-namespace internal {
-
 class ViewClickListener;
 
 // A view that changes background color on hover, and triggers a callback in the
@@ -37,6 +36,7 @@ class HoverHighlightView : public ActionableView {
   // blank icon.  This also sets the accessible name.
   // Returns label after parenting it.
   views::Label* AddLabel(const base::string16& text,
+                         gfx::HorizontalAlignment alignment,
                          gfx::Font::FontStyle style);
 
   // Convenience function for adding an optional check and a label.  In the
@@ -59,12 +59,15 @@ class HoverHighlightView : public ActionableView {
 
   bool hover() const { return hover_; }
 
+ protected:
+  // Overridden from views::View.
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
+
  private:
   // Overridden from ActionableView:
   virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual int GetHeightForWidth(int width) OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
@@ -87,7 +90,6 @@ class HoverHighlightView : public ActionableView {
   DISALLOW_COPY_AND_ASSIGN(HoverHighlightView);
 };
 
-}  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_HOVER_HIGHLIGHT_VIEW_H_