diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 03:43:18 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-09 03:43:18 +0000 |
| commit | 07f0f2cf81b968bead9fd6eccfd1184982da8029 (patch) | |
| tree | afbe990b809ca974baf95ff6ba18ee8a97800799 /ui/keyboard | |
| parent | b76bc355b27ea00563991dffbfc026ecab7bb7a2 (diff) | |
| download | chromium_src-07f0f2cf81b968bead9fd6eccfd1184982da8029.zip chromium_src-07f0f2cf81b968bead9fd6eccfd1184982da8029.tar.gz chromium_src-07f0f2cf81b968bead9fd6eccfd1184982da8029.tar.bz2 | |
Fix WeakPtrFactory ordering problems in ui
BUG=303818
Review URL: https://codereview.chromium.org/26455003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
| -rw-r--r-- | ui/keyboard/keyboard_controller.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/keyboard/keyboard_controller.h b/ui/keyboard/keyboard_controller.h index dd044dc..5323e67 100644 --- a/ui/keyboard/keyboard_controller.h +++ b/ui/keyboard/keyboard_controller.h @@ -82,10 +82,11 @@ class KEYBOARD_EXPORT KeyboardController : public ui::InputMethodObserver, scoped_ptr<aura::Window> container_; ui::InputMethod* input_method_; bool keyboard_visible_; - base::WeakPtrFactory<KeyboardController> weak_factory_; ObserverList<KeyboardControllerObserver> observer_list_; + base::WeakPtrFactory<KeyboardController> weak_factory_; + DISALLOW_COPY_AND_ASSIGN(KeyboardController); }; |