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

Side by Side Diff: ui/keyboard/keyboard_controller.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « ui/gl/sync_control_vsync_provider.h ('k') | ui/keyboard/keyboard_controller.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 UI_KEYBOARD_KEYBOARD_CONTROLLER_H_ 5 #ifndef UI_KEYBOARD_KEYBOARD_CONTROLLER_H_
6 #define UI_KEYBOARD_KEYBOARD_CONTROLLER_H_ 6 #define UI_KEYBOARD_KEYBOARD_CONTROLLER_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/event_types.h" 9 #include "base/event_types.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 // Updates insets on web content window 110 // Updates insets on web content window
111 void UpdateWindowInsets(aura::Window* window); 111 void UpdateWindowInsets(aura::Window* window);
112 112
113 private: 113 private:
114 // For access to Observer methods for simulation. 114 // For access to Observer methods for simulation.
115 friend class KeyboardControllerTest; 115 friend class KeyboardControllerTest;
116 116
117 // aura::WindowObserver overrides 117 // aura::WindowObserver overrides
118 virtual void OnWindowHierarchyChanged( 118 virtual void OnWindowHierarchyChanged(
119 const HierarchyChangeParams& params) OVERRIDE; 119 const HierarchyChangeParams& params) override;
120 120
121 // InputMethodObserver overrides 121 // InputMethodObserver overrides
122 virtual void OnTextInputTypeChanged( 122 virtual void OnTextInputTypeChanged(
123 const ui::TextInputClient* client) OVERRIDE {} 123 const ui::TextInputClient* client) override {}
124 virtual void OnFocus() OVERRIDE {} 124 virtual void OnFocus() override {}
125 virtual void OnBlur() OVERRIDE {} 125 virtual void OnBlur() override {}
126 virtual void OnCaretBoundsChanged( 126 virtual void OnCaretBoundsChanged(
127 const ui::TextInputClient* client) OVERRIDE {} 127 const ui::TextInputClient* client) override {}
128 virtual void OnTextInputStateChanged( 128 virtual void OnTextInputStateChanged(
129 const ui::TextInputClient* client) OVERRIDE; 129 const ui::TextInputClient* client) override;
130 virtual void OnInputMethodDestroyed( 130 virtual void OnInputMethodDestroyed(
131 const ui::InputMethod* input_method) OVERRIDE; 131 const ui::InputMethod* input_method) override;
132 virtual void OnShowImeIfNeeded() OVERRIDE; 132 virtual void OnShowImeIfNeeded() override;
133 133
134 // Show virtual keyboard immediately with animation. 134 // Show virtual keyboard immediately with animation.
135 void ShowKeyboardInternal(); 135 void ShowKeyboardInternal();
136 136
137 // Clears any insets on web content windows. 137 // Clears any insets on web content windows.
138 void ResetWindowInsets(); 138 void ResetWindowInsets();
139 139
140 // Returns true if keyboard is scheduled to hide. 140 // Returns true if keyboard is scheduled to hide.
141 bool WillHideKeyboard() const; 141 bool WillHideKeyboard() const;
142 142
(...skipping 29 matching lines...) Expand all
172 static KeyboardController* instance_; 172 static KeyboardController* instance_;
173 173
174 base::WeakPtrFactory<KeyboardController> weak_factory_; 174 base::WeakPtrFactory<KeyboardController> weak_factory_;
175 175
176 DISALLOW_COPY_AND_ASSIGN(KeyboardController); 176 DISALLOW_COPY_AND_ASSIGN(KeyboardController);
177 }; 177 };
178 178
179 } // namespace keyboard 179 } // namespace keyboard
180 180
181 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_H_ 181 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/gl/sync_control_vsync_provider.h ('k') | ui/keyboard/keyboard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698