| 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 "ui/views/corewm/base_focus_rules.h" | 5 #include "ui/wm/core/base_focus_rules.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/activation_delegate.h" | 7 #include "ui/aura/client/activation_delegate.h" |
| 8 #include "ui/aura/client/focus_client.h" | 8 #include "ui/aura/client/focus_client.h" |
| 9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/aura/window_event_dispatcher.h" | 10 #include "ui/aura/window_event_dispatcher.h" |
| 11 #include "ui/views/corewm/window_modality_controller.h" | 11 #include "ui/wm/core/window_modality_controller.h" |
| 12 #include "ui/views/corewm/window_util.h" | 12 #include "ui/wm/core/window_util.h" |
| 13 | 13 |
| 14 namespace views { | 14 namespace views { |
| 15 namespace corewm { | 15 namespace corewm { |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 aura::Window* GetFocusedWindow(aura::Window* context) { | 18 aura::Window* GetFocusedWindow(aura::Window* context) { |
| 19 aura::client::FocusClient* focus_client = | 19 aura::client::FocusClient* focus_client = |
| 20 aura::client::GetFocusClient(context); | 20 aura::client::GetFocusClient(context); |
| 21 return focus_client ? focus_client->GetFocusedWindow() : NULL; | 21 return focus_client ? focus_client->GetFocusedWindow() : NULL; |
| 22 } | 22 } |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 if (cur == ignore) | 188 if (cur == ignore) |
| 189 continue; | 189 continue; |
| 190 if (CanActivateWindow(cur)) | 190 if (CanActivateWindow(cur)) |
| 191 return cur; | 191 return cur; |
| 192 } | 192 } |
| 193 return NULL; | 193 return NULL; |
| 194 } | 194 } |
| 195 | 195 |
| 196 } // namespace corewm | 196 } // namespace corewm |
| 197 } // namespace views | 197 } // namespace views |
| OLD | NEW |