| 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/focus_controller.h" | 5 #include "ui/wm/core/focus_controller.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "ui/aura/client/activation_change_observer.h" | 9 #include "ui/aura/client/activation_change_observer.h" |
| 10 #include "ui/aura/client/activation_client.h" | 10 #include "ui/aura/client/activation_client.h" |
| 11 #include "ui/aura/client/aura_constants.h" | 11 #include "ui/aura/client/aura_constants.h" |
| 12 #include "ui/aura/client/default_capture_client.h" | 12 #include "ui/aura/client/default_capture_client.h" |
| 13 #include "ui/aura/client/focus_change_observer.h" | 13 #include "ui/aura/client/focus_change_observer.h" |
| 14 #include "ui/aura/test/aura_test_base.h" | 14 #include "ui/aura/test/aura_test_base.h" |
| 15 #include "ui/aura/test/event_generator.h" | 15 #include "ui/aura/test/event_generator.h" |
| 16 #include "ui/aura/test/test_window_delegate.h" | 16 #include "ui/aura/test/test_window_delegate.h" |
| 17 #include "ui/aura/test/test_windows.h" | 17 #include "ui/aura/test/test_windows.h" |
| 18 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
| 19 #include "ui/aura/window_event_dispatcher.h" | 19 #include "ui/aura/window_event_dispatcher.h" |
| 20 #include "ui/aura/window_tracker.h" | 20 #include "ui/aura/window_tracker.h" |
| 21 #include "ui/events/event_handler.h" | 21 #include "ui/events/event_handler.h" |
| 22 #include "ui/views/corewm/base_focus_rules.h" | 22 #include "ui/wm/core/base_focus_rules.h" |
| 23 #include "ui/views/corewm/wm_state.h" | 23 #include "ui/wm/core/wm_state.h" |
| 24 | 24 |
| 25 namespace views { | 25 namespace views { |
| 26 namespace corewm { | 26 namespace corewm { |
| 27 | 27 |
| 28 class FocusNotificationObserver : public aura::client::ActivationChangeObserver, | 28 class FocusNotificationObserver : public aura::client::ActivationChangeObserver, |
| 29 public aura::client::FocusChangeObserver { | 29 public aura::client::FocusChangeObserver { |
| 30 public: | 30 public: |
| 31 FocusNotificationObserver() | 31 FocusNotificationObserver() |
| 32 : activation_changed_count_(0), | 32 : activation_changed_count_(0), |
| 33 focus_changed_count_(0), | 33 focus_changed_count_(0), |
| (...skipping 1161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1195 DIRECT_FOCUS_CHANGE_TESTS(NoFocusChangeOnClickOnCaptureWindow); | 1195 DIRECT_FOCUS_CHANGE_TESTS(NoFocusChangeOnClickOnCaptureWindow); |
| 1196 | 1196 |
| 1197 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, | 1197 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, |
| 1198 ChangeFocusWhenNothingFocusedAndCaptured); | 1198 ChangeFocusWhenNothingFocusedAndCaptured); |
| 1199 | 1199 |
| 1200 // See description above DontPassDeletedWindow() for details. | 1200 // See description above DontPassDeletedWindow() for details. |
| 1201 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow); | 1201 FOCUS_CONTROLLER_TEST(FocusControllerApiTest, DontPassDeletedWindow); |
| 1202 | 1202 |
| 1203 } // namespace corewm | 1203 } // namespace corewm |
| 1204 } // namespace views | 1204 } // namespace views |
| OLD | NEW |