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/window_cycle_controller.h" | 8 #include "ash/wm/window_cycle_controller.h" |
9 #include "ui/aura/client/activation_client.h" | 9 #include "ui/aura/client/activation_client.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
11 #include "ui/views/accessible_pane_view.h" | 11 #include "ui/views/accessible_pane_view.h" |
12 #include "ui/views/focus/focus_search.h" | 12 #include "ui/views/focus/focus_search.h" |
13 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
14 | 14 |
15 namespace ash { | 15 namespace ash { |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 bool HasFocusableWindow() { | 19 bool HasFocusableWindow() { |
20 return !WindowCycleController::BuildWindowList().empty(); | 20 return !WindowCycleController::BuildWindowList(NULL).empty(); |
21 } | 21 } |
22 | 22 |
23 } // namespace | 23 } // namespace |
24 | 24 |
25 namespace internal { | 25 namespace internal { |
26 | 26 |
27 FocusCycler::FocusCycler() : widget_activating_(NULL) { | 27 FocusCycler::FocusCycler() : widget_activating_(NULL) { |
28 } | 28 } |
29 | 29 |
30 FocusCycler::~FocusCycler() { | 30 FocusCycler::~FocusCycler() { |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 widget_activating_ = NULL; | 84 widget_activating_ = NULL; |
85 if (widget->IsActive()) | 85 if (widget->IsActive()) |
86 return true; | 86 return true; |
87 } | 87 } |
88 return false; | 88 return false; |
89 } | 89 } |
90 | 90 |
91 } // namespace internal | 91 } // namespace internal |
92 | 92 |
93 } // namespace ash | 93 } // namespace ash |
OLD | NEW |