Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ash / ime / mode_indicator_view.h

diff --git a/src/ash/ime/mode_indicator_view.h b/src/ash/ime/mode_indicator_view.h
index 2b3a8a8..9e00ceb 100644 (file)
--- a/src/ash/ime/mode_indicator_view.h
+++ b/src/ash/ime/mode_indicator_view.h
@@ -14,6 +14,7 @@
 
 namespace views {
 class Label;
+class Widget;
 }  // namespace views
 
 namespace ash {
@@ -24,26 +25,28 @@ class ASH_EXPORT ModeIndicatorView : public views::BubbleDelegateView {
   ModeIndicatorView(gfx::NativeView parent,
                     const gfx::Rect& cursor_bounds,
                     const base::string16& label);
-  virtual ~ModeIndicatorView();
+  ~ModeIndicatorView() override;
 
   // Show the mode indicator then hide with fading animation.
   void ShowAndFadeOut();
 
   // views::BubbleDelegateView override:
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  gfx::Size GetPreferredSize() const override;
 
  protected:
   // views::BubbleDelegateView override:
-  virtual void Init() OVERRIDE;
+  void Init() override;
 
- private:
-  // Hide the window with fading animation.  This is called from
-  // ShowAndFadeOut.
-  void FadeOut();
+  // views::WidgetDelegateView overrides:
+  views::NonClientFrameView* CreateNonClientFrameView(
+      views::Widget* widget) override;
 
+ private:
   gfx::Rect cursor_bounds_;
   views::Label* label_view_;
-  base::OneShotTimer<ModeIndicatorView> timer_;
+  base::OneShotTimer<views::Widget> timer_;
+
+  DISALLOW_COPY_AND_ASSIGN(ModeIndicatorView);
 };
 
 }  // namespace ime