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

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

Issue 589413002: Fix WeakPtrFactory member ordering in ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unwanted header inclusions 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/aura/client/screen_position_client.cc ('k') | ui/views/accessible_pane_view.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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_; 159 scoped_ptr<WindowBoundsChangeObserver> window_bounds_observer_;
160 160
161 ui::InputMethod* input_method_; 161 ui::InputMethod* input_method_;
162 bool keyboard_visible_; 162 bool keyboard_visible_;
163 bool show_on_resize_; 163 bool show_on_resize_;
164 bool lock_keyboard_; 164 bool lock_keyboard_;
165 ui::TextInputType type_; 165 ui::TextInputType type_;
166 166
167 ObserverList<KeyboardControllerObserver> observer_list_; 167 ObserverList<KeyboardControllerObserver> observer_list_;
168 168
169 base::WeakPtrFactory<KeyboardController> weak_factory_;
170
171 // The currently used keyboard position. 169 // The currently used keyboard position.
172 gfx::Rect current_keyboard_bounds_; 170 gfx::Rect current_keyboard_bounds_;
173 171
174 static KeyboardController* instance_; 172 static KeyboardController* instance_;
175 173
174 base::WeakPtrFactory<KeyboardController> weak_factory_;
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/aura/client/screen_position_client.cc ('k') | ui/views/accessible_pane_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698