| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/services/window_manager/focus_controller.h" | 5 #include "services/window_manager/focus_controller.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "mojo/services/public/cpp/view_manager/view_property.h" | 8 #include "mojo/services/public/cpp/view_manager/view_property.h" |
| 9 #include "mojo/services/public/cpp/view_manager/view_tracker.h" | 9 #include "mojo/services/public/cpp/view_manager/view_tracker.h" |
| 10 #include "mojo/services/window_manager/focus_controller_observer.h" | 10 #include "services/window_manager/focus_controller_observer.h" |
| 11 #include "mojo/services/window_manager/focus_rules.h" | 11 #include "services/window_manager/focus_rules.h" |
| 12 #include "mojo/services/window_manager/view_target.h" | 12 #include "services/window_manager/view_target.h" |
| 13 #include "mojo/services/window_manager/window_manager_app.h" | 13 #include "services/window_manager/window_manager_app.h" |
| 14 #include "ui/events/event.h" | 14 #include "ui/events/event.h" |
| 15 | 15 |
| 16 DECLARE_VIEW_PROPERTY_TYPE(mojo::FocusController*); | 16 DECLARE_VIEW_PROPERTY_TYPE(mojo::FocusController*); |
| 17 | 17 |
| 18 namespace mojo { | 18 namespace mojo { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 DEFINE_VIEW_PROPERTY_KEY(FocusController*, kRootViewFocusController, nullptr); | 21 DEFINE_VIEW_PROPERTY_KEY(FocusController*, kRootViewFocusController, nullptr); |
| 22 } // namespace | 22 } // namespace |
| 23 | 23 |
| (...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 311 } | 311 } |
| 312 | 312 |
| 313 FocusController* GetFocusController(View* root_view) { | 313 FocusController* GetFocusController(View* root_view) { |
| 314 if (root_view) | 314 if (root_view) |
| 315 DCHECK_EQ(root_view->GetRoot(), root_view); | 315 DCHECK_EQ(root_view->GetRoot(), root_view); |
| 316 return root_view ? | 316 return root_view ? |
| 317 root_view->GetLocalProperty(kRootViewFocusController) : nullptr; | 317 root_view->GetLocalProperty(kRootViewFocusController) : nullptr; |
| 318 } | 318 } |
| 319 | 319 |
| 320 } // namespace mojo | 320 } // namespace mojo |
| OLD | NEW |