Update To 11.40.268.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 47d15cf..2b736ce 100644 (file)
--- a/src/ash/system/tray/hover_highlight_view.h
+++ b/src/ash/system/tray/hover_highlight_view.h
@@ -24,7 +24,7 @@ class ViewClickListener;
 class HoverHighlightView : public ActionableView {
  public:
   explicit HoverHighlightView(ViewClickListener* listener);
-  virtual ~HoverHighlightView();
+  ~HoverHighlightView() override;
 
   // Convenience function for adding an icon and a label.  This also sets the
   // accessible name.
@@ -61,20 +61,24 @@ class HoverHighlightView : public ActionableView {
 
  protected:
   // Overridden from views::View.
-  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
+  void GetAccessibleState(ui::AXViewState* state) override;
 
  private:
+  // Sets the highlighted color on a text label if |hover| is set.
+  void SetHoverHighlight(bool hover);
+
   // Overridden from ActionableView:
-  virtual bool PerformAction(const ui::Event& event) OVERRIDE;
+  bool PerformAction(const ui::Event& event) override;
 
   // Overridden from views::View.
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual int GetHeightForWidth(int width) const OVERRIDE;
-  virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
-  virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
-  virtual void OnEnabledChanged() OVERRIDE;
-  virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE;
-  virtual void OnFocus() OVERRIDE;
+  gfx::Size GetPreferredSize() const override;
+  int GetHeightForWidth(int width) const override;
+  void OnMouseEntered(const ui::MouseEvent& event) override;
+  void OnMouseExited(const ui::MouseEvent& event) override;
+  void OnGestureEvent(ui::GestureEvent* event) override;
+  void OnEnabledChanged() override;
+  void OnPaintBackground(gfx::Canvas* canvas) override;
+  void OnFocus() override;
 
   ViewClickListener* listener_;
   views::Label* text_label_;