Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Side by Side Diff: ash/ime/mode_indicator_view.h

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/ime/input_method_menu_manager_unittest.cc ('k') | ash/ime/mode_indicator_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_IME_MODE_INDICATOR_VIEW_H_ 5 #ifndef ASH_IME_MODE_INDICATOR_VIEW_H_
6 #define ASH_IME_MODE_INDICATOR_VIEW_H_ 6 #define ASH_IME_MODE_INDICATOR_VIEW_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/timer/timer.h" 10 #include "base/timer/timer.h"
(...skipping 13 matching lines...) Expand all
24 public: 24 public:
25 ModeIndicatorView(gfx::NativeView parent, 25 ModeIndicatorView(gfx::NativeView parent,
26 const gfx::Rect& cursor_bounds, 26 const gfx::Rect& cursor_bounds,
27 const base::string16& label); 27 const base::string16& label);
28 virtual ~ModeIndicatorView(); 28 virtual ~ModeIndicatorView();
29 29
30 // Show the mode indicator then hide with fading animation. 30 // Show the mode indicator then hide with fading animation.
31 void ShowAndFadeOut(); 31 void ShowAndFadeOut();
32 32
33 // views::BubbleDelegateView override: 33 // views::BubbleDelegateView override:
34 virtual gfx::Size GetPreferredSize() const OVERRIDE; 34 virtual gfx::Size GetPreferredSize() const override;
35 35
36 protected: 36 protected:
37 // views::BubbleDelegateView override: 37 // views::BubbleDelegateView override:
38 virtual void Init() OVERRIDE; 38 virtual void Init() override;
39 39
40 // views::WidgetDelegateView overrides: 40 // views::WidgetDelegateView overrides:
41 virtual views::NonClientFrameView* CreateNonClientFrameView( 41 virtual views::NonClientFrameView* CreateNonClientFrameView(
42 views::Widget* widget) OVERRIDE; 42 views::Widget* widget) override;
43 43
44 private: 44 private:
45 gfx::Rect cursor_bounds_; 45 gfx::Rect cursor_bounds_;
46 views::Label* label_view_; 46 views::Label* label_view_;
47 base::OneShotTimer<views::Widget> timer_; 47 base::OneShotTimer<views::Widget> timer_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(ModeIndicatorView); 49 DISALLOW_COPY_AND_ASSIGN(ModeIndicatorView);
50 }; 50 };
51 51
52 } // namespace ime 52 } // namespace ime
53 } // namespace ash 53 } // namespace ash
54 54
55 #endif // ASH_IME_MODE_INDICATOR_VIEW_H_ 55 #endif // ASH_IME_MODE_INDICATOR_VIEW_H_
OLDNEW
« no previous file with comments | « ash/ime/input_method_menu_manager_unittest.cc ('k') | ash/ime/mode_indicator_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698