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

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

Issue 2692983006: Remove an unnecessary field in KeyboardController. (Closed)
Patch Set: rebase Created 3 years, 10 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 | « no previous file | 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 <memory> 8 #include <memory>
9 9
10 #include "base/event_types.h" 10 #include "base/event_types.h"
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 // CallbackAnimationObserver should destructed before container_ because it 170 // CallbackAnimationObserver should destructed before container_ because it
171 // uses container_'s animator. 171 // uses container_'s animator.
172 std::unique_ptr<CallbackAnimationObserver> animation_observer_; 172 std::unique_ptr<CallbackAnimationObserver> animation_observer_;
173 173
174 ui::InputMethod* input_method_; 174 ui::InputMethod* input_method_;
175 bool keyboard_visible_; 175 bool keyboard_visible_;
176 bool show_on_resize_; 176 bool show_on_resize_;
177 // If true, the keyboard is always visible even if no window has input focus. 177 // If true, the keyboard is always visible even if no window has input focus.
178 bool keyboard_locked_; 178 bool keyboard_locked_;
179 KeyboardMode keyboard_mode_; 179 KeyboardMode keyboard_mode_;
180 ui::TextInputType type_;
181 KeyboardEventFilter event_filter_; 180 KeyboardEventFilter event_filter_;
182 181
183 base::ObserverList<KeyboardControllerObserver> observer_list_; 182 base::ObserverList<KeyboardControllerObserver> observer_list_;
184 183
185 // The currently used keyboard position. 184 // The currently used keyboard position.
186 gfx::Rect current_keyboard_bounds_; 185 gfx::Rect current_keyboard_bounds_;
187 186
188 static KeyboardController* instance_; 187 static KeyboardController* instance_;
189 188
190 base::WeakPtrFactory<KeyboardController> weak_factory_; 189 base::WeakPtrFactory<KeyboardController> weak_factory_;
191 190
192 DISALLOW_COPY_AND_ASSIGN(KeyboardController); 191 DISALLOW_COPY_AND_ASSIGN(KeyboardController);
193 }; 192 };
194 193
195 } // namespace keyboard 194 } // namespace keyboard
196 195
197 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_H_ 196 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | ui/keyboard/keyboard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698