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

Side by Side Diff: chrome/browser/chromeos/input_method/candidate_window_controller_impl.h

Issue 796693005: Update {virtual,override,final} to follow C++11 style in chrome/browser/chromeos/input_method. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL_H_
7 7
8 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h" 8 #include "chrome/browser/chromeos/input_method/candidate_window_controller.h"
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 23 matching lines...) Expand all
34 34
35 // The implementation of CandidateWindowController. 35 // The implementation of CandidateWindowController.
36 // CandidateWindowController controls the CandidateWindow. 36 // CandidateWindowController controls the CandidateWindow.
37 class CandidateWindowControllerImpl 37 class CandidateWindowControllerImpl
38 : public CandidateWindowController, 38 : public CandidateWindowController,
39 public ui::ime::CandidateWindowView::Observer, 39 public ui::ime::CandidateWindowView::Observer,
40 public views::WidgetObserver, 40 public views::WidgetObserver,
41 public IMECandidateWindowHandlerInterface { 41 public IMECandidateWindowHandlerInterface {
42 public: 42 public:
43 CandidateWindowControllerImpl(); 43 CandidateWindowControllerImpl();
44 virtual ~CandidateWindowControllerImpl(); 44 ~CandidateWindowControllerImpl() override;
45 45
46 // CandidateWindowController overrides: 46 // CandidateWindowController overrides:
47 virtual void AddObserver( 47 void AddObserver(CandidateWindowController::Observer* observer) override;
48 CandidateWindowController::Observer* observer) override; 48 void RemoveObserver(CandidateWindowController::Observer* observer) override;
49 virtual void RemoveObserver( 49 void Hide() override;
50 CandidateWindowController::Observer* observer) override;
51 virtual void Hide() override;
52 50
53 protected: 51 protected:
54 static void ConvertLookupTableToInfolistEntry( 52 static void ConvertLookupTableToInfolistEntry(
55 const ui::CandidateWindow& candidate_window, 53 const ui::CandidateWindow& candidate_window,
56 std::vector<ui::InfolistEntry>* infolist_entries, 54 std::vector<ui::InfolistEntry>* infolist_entries,
57 bool* has_highlighted); 55 bool* has_highlighted);
58 56
59 private: 57 private:
60 // ui::ime::CandidateWindowView::Observer implementation. 58 // ui::ime::CandidateWindowView::Observer implementation.
61 virtual void OnCandidateCommitted(int index) override; 59 void OnCandidateCommitted(int index) override;
62 60
63 // views::WidgetObserver implementation. 61 // views::WidgetObserver implementation.
64 virtual void OnWidgetClosing(views::Widget* widget) override; 62 void OnWidgetClosing(views::Widget* widget) override;
65 63
66 // IMECandidateWindowHandlerInterface implementation. 64 // IMECandidateWindowHandlerInterface implementation.
67 virtual void SetCursorBounds(const gfx::Rect& cursor_bounds, 65 void SetCursorBounds(const gfx::Rect& cursor_bounds,
68 const gfx::Rect& composition_head) override; 66 const gfx::Rect& composition_head) override;
69 virtual void UpdateLookupTable( 67 void UpdateLookupTable(const ui::CandidateWindow& candidate_window,
70 const ui::CandidateWindow& candidate_window, 68 bool visible) override;
71 bool visible) override; 69 void UpdatePreeditText(const base::string16& text,
72 virtual void UpdatePreeditText(const base::string16& text, 70 unsigned int cursor,
73 unsigned int cursor, bool visible) override; 71 bool visible) override;
74 virtual void FocusStateChanged(bool is_focused) override; 72 void FocusStateChanged(bool is_focused) override;
75 73
76 void InitCandidateWindowView(); 74 void InitCandidateWindowView();
77 75
78 // The candidate window view. 76 // The candidate window view.
79 ui::ime::CandidateWindowView* candidate_window_view_; 77 ui::ime::CandidateWindowView* candidate_window_view_;
80 78
81 // This is the outer frame of the infolist window view. Owned by the widget. 79 // This is the outer frame of the infolist window view. Owned by the widget.
82 ui::ime::InfolistWindow* infolist_window_; 80 ui::ime::InfolistWindow* infolist_window_;
83 81
84 gfx::Rect cursor_bounds_; 82 gfx::Rect cursor_bounds_;
85 gfx::Rect composition_head_; 83 gfx::Rect composition_head_;
86 84
87 // This is the controller of the IME mode indicator. 85 // This is the controller of the IME mode indicator.
88 scoped_ptr<ModeIndicatorController> mode_indicator_controller_; 86 scoped_ptr<ModeIndicatorController> mode_indicator_controller_;
89 87
90 // The infolist entries and its focused index which currently shown in 88 // The infolist entries and its focused index which currently shown in
91 // Infolist window. 89 // Infolist window.
92 std::vector<ui::InfolistEntry> latest_infolist_entries_; 90 std::vector<ui::InfolistEntry> latest_infolist_entries_;
93 91
94 ObserverList<CandidateWindowController::Observer> observers_; 92 ObserverList<CandidateWindowController::Observer> observers_;
95 93
96 DISALLOW_COPY_AND_ASSIGN(CandidateWindowControllerImpl); 94 DISALLOW_COPY_AND_ASSIGN(CandidateWindowControllerImpl);
97 }; 95 };
98 96
99 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL _H_ 97 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_CANDIDATE_WINDOW_CONTROLLER_IMPL _H_
100 98
101 } // namespace input_method 99 } // namespace input_method
102 } // namespace chromeos 100 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698