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

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

Issue 1162943002: Replace more ObserverList with base::ObserverList. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@observer
Patch Set: Created 5 years, 6 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/gpu_switching_manager.h ('k') | ui/message_center/message_center_impl.h » ('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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 174
175 scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_; 175 scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_;
176 176
177 ui::InputMethod* input_method_; 177 ui::InputMethod* input_method_;
178 bool keyboard_visible_; 178 bool keyboard_visible_;
179 bool show_on_resize_; 179 bool show_on_resize_;
180 bool lock_keyboard_; 180 bool lock_keyboard_;
181 KeyboardMode keyboard_mode_; 181 KeyboardMode keyboard_mode_;
182 ui::TextInputType type_; 182 ui::TextInputType type_;
183 183
184 ObserverList<KeyboardControllerObserver> observer_list_; 184 base::ObserverList<KeyboardControllerObserver> observer_list_;
185 185
186 // The currently used keyboard position. 186 // The currently used keyboard position.
187 gfx::Rect current_keyboard_bounds_; 187 gfx::Rect current_keyboard_bounds_;
188 188
189 static KeyboardController* instance_; 189 static KeyboardController* instance_;
190 190
191 base::WeakPtrFactory<KeyboardController> weak_factory_; 191 base::WeakPtrFactory<KeyboardController> weak_factory_;
192 192
193 DISALLOW_COPY_AND_ASSIGN(KeyboardController); 193 DISALLOW_COPY_AND_ASSIGN(KeyboardController);
194 }; 194 };
195 195
196 } // namespace keyboard 196 } // namespace keyboard
197 197
198 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_H_ 198 #endif // UI_KEYBOARD_KEYBOARD_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ui/gl/gpu_switching_manager.h ('k') | ui/message_center/message_center_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698