OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_WM_CORE_FOCUS_CONTROLLER_H_ | 5 #ifndef UI_WM_CORE_FOCUS_CONTROLLER_H_ |
6 #define UI_WM_CORE_FOCUS_CONTROLLER_H_ | 6 #define UI_WM_CORE_FOCUS_CONTROLLER_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "base/observer_list.h" | 12 #include "base/observer_list.h" |
12 #include "base/scoped_observer.h" | 13 #include "base/scoped_observer.h" |
13 #include "ui/aura/client/focus_client.h" | 14 #include "ui/aura/client/focus_client.h" |
14 #include "ui/aura/window_observer.h" | 15 #include "ui/aura/window_observer.h" |
15 #include "ui/events/event_handler.h" | 16 #include "ui/events/event_handler.h" |
16 #include "ui/wm/public/activation_change_observer.h" | 17 #include "ui/wm/public/activation_change_observer.h" |
17 #include "ui/wm/public/activation_client.h" | 18 #include "ui/wm/public/activation_client.h" |
18 #include "ui/wm/wm_export.h" | 19 #include "ui/wm/wm_export.h" |
19 | 20 |
20 namespace wm { | 21 namespace wm { |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 // event targeted at that window. Rules determine the best focusable window | 116 // event targeted at that window. Rules determine the best focusable window |
116 // for the input window. | 117 // for the input window. |
117 void WindowFocusedFromInputEvent(aura::Window* window); | 118 void WindowFocusedFromInputEvent(aura::Window* window); |
118 | 119 |
119 aura::Window* active_window_; | 120 aura::Window* active_window_; |
120 aura::Window* focused_window_; | 121 aura::Window* focused_window_; |
121 | 122 |
122 bool updating_focus_; | 123 bool updating_focus_; |
123 bool updating_activation_; | 124 bool updating_activation_; |
124 | 125 |
125 scoped_ptr<FocusRules> rules_; | 126 std::unique_ptr<FocusRules> rules_; |
126 | 127 |
127 base::ObserverList<aura::client::ActivationChangeObserver> | 128 base::ObserverList<aura::client::ActivationChangeObserver> |
128 activation_observers_; | 129 activation_observers_; |
129 base::ObserverList<aura::client::FocusChangeObserver> focus_observers_; | 130 base::ObserverList<aura::client::FocusChangeObserver> focus_observers_; |
130 | 131 |
131 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_; | 132 ScopedObserver<aura::Window, aura::WindowObserver> observer_manager_; |
132 | 133 |
133 DISALLOW_COPY_AND_ASSIGN(FocusController); | 134 DISALLOW_COPY_AND_ASSIGN(FocusController); |
134 }; | 135 }; |
135 | 136 |
136 } // namespace wm | 137 } // namespace wm |
137 | 138 |
138 #endif // UI_WM_CORE_FOCUS_CONTROLLER_H_ | 139 #endif // UI_WM_CORE_FOCUS_CONTROLLER_H_ |
OLD | NEW |