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 #include "ash/focus_cycler.h" | 5 #include "ash/focus_cycler.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/wm/mru_window_tracker.h" | 8 #include "ash/wm/mru_window_tracker.h" |
9 #include "ash/wm/widget_finder.h" | 9 #include "ash/wm/widget_finder.h" |
10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
11 #include "ash/wm/window_util.h" | 11 #include "ash/wm/window_util.h" |
12 #include "ash/wm_shell.h" | |
13 #include "ash/wm_window.h" | 12 #include "ash/wm_window.h" |
14 #include "ui/views/accessible_pane_view.h" | 13 #include "ui/views/accessible_pane_view.h" |
15 #include "ui/views/focus/focus_search.h" | 14 #include "ui/views/focus/focus_search.h" |
16 #include "ui/views/widget/widget.h" | 15 #include "ui/views/widget/widget.h" |
17 #include "ui/wm/public/activation_client.h" | 16 #include "ui/wm/public/activation_client.h" |
18 | 17 |
19 namespace ash { | 18 namespace ash { |
20 | 19 |
21 namespace { | 20 namespace { |
22 | 21 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 bool FocusCycler::FocusWidget(views::Widget* widget) { | 107 bool FocusCycler::FocusWidget(views::Widget* widget) { |
109 // Note: It is not necessary to set the focus directly to the pane since that | 108 // Note: It is not necessary to set the focus directly to the pane since that |
110 // will be taken care of by the widget activation. | 109 // will be taken care of by the widget activation. |
111 widget_activating_ = widget; | 110 widget_activating_ = widget; |
112 widget->Activate(); | 111 widget->Activate(); |
113 widget_activating_ = NULL; | 112 widget_activating_ = NULL; |
114 return widget->IsActive(); | 113 return widget->IsActive(); |
115 } | 114 } |
116 | 115 |
117 } // namespace ash | 116 } // namespace ash |
OLD | NEW |