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

Side by Side Diff: ash/ime/infolist_window.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/candidate_window_view.cc ('k') | ash/ime/infolist_window.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_INFOLIST_WINDOW_H_ 5 #ifndef ASH_IME_INFOLIST_WINDOW_H_
6 #define ASH_IME_INFOLIST_WINDOW_H_ 6 #define ASH_IME_INFOLIST_WINDOW_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 24 matching lines...) Expand all
35 // Show/hide itself with a delay. 35 // Show/hide itself with a delay.
36 void ShowWithDelay(); 36 void ShowWithDelay();
37 void HideWithDelay(); 37 void HideWithDelay();
38 38
39 // Show/hide without delays. 39 // Show/hide without delays.
40 void ShowImmediately(); 40 void ShowImmediately();
41 void HideImmediately(); 41 void HideImmediately();
42 42
43 private: 43 private:
44 // views::WidgetDelegate implementation. 44 // views::WidgetDelegate implementation.
45 virtual void WindowClosing() OVERRIDE; 45 virtual void WindowClosing() override;
46 46
47 // The list of visible entries. Owned by views hierarchy. 47 // The list of visible entries. Owned by views hierarchy.
48 std::vector<InfolistEntryView*> entry_views_; 48 std::vector<InfolistEntryView*> entry_views_;
49 49
50 // Information title font. 50 // Information title font.
51 gfx::FontList title_font_list_; 51 gfx::FontList title_font_list_;
52 52
53 // Information description font. 53 // Information description font.
54 gfx::FontList description_font_list_; 54 gfx::FontList description_font_list_;
55 55
56 base::OneShotTimer<views::Widget> show_hide_timer_; 56 base::OneShotTimer<views::Widget> show_hide_timer_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(InfolistWindow); 58 DISALLOW_COPY_AND_ASSIGN(InfolistWindow);
59 }; 59 };
60 60
61 } // namespace ime 61 } // namespace ime
62 } // namespace ash 62 } // namespace ash
63 63
64 #endif // ASH_IME_INFOLIST_WINDOW_H_ 64 #endif // ASH_IME_INFOLIST_WINDOW_H_
OLDNEW
« no previous file with comments | « ash/ime/candidate_window_view.cc ('k') | ash/ime/infolist_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698