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 #ifndef UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_ | 5 #ifndef UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_ |
6 #define UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_ | 6 #define UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_ |
7 | 7 |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "ui/aura/client/activation_client.h" | 10 #include "ui/aura/client/activation_client.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 | 40 |
41 private: | 41 private: |
42 void RemoveActiveWindow(Window* window); | 42 void RemoveActiveWindow(Window* window); |
43 | 43 |
44 // This class explicitly does NOT store the active window in a window property | 44 // This class explicitly does NOT store the active window in a window property |
45 // to make sure that ActivationChangeObserver is not treated as part of the | 45 // to make sure that ActivationChangeObserver is not treated as part of the |
46 // aura API. Assumptions to that end will cause tests that use this client to | 46 // aura API. Assumptions to that end will cause tests that use this client to |
47 // fail. | 47 // fail. |
48 std::vector<Window*> active_windows_; | 48 std::vector<Window*> active_windows_; |
49 | 49 |
| 50 ObserverList<client::ActivationChangeObserver> observers_; |
| 51 |
50 DISALLOW_COPY_AND_ASSIGN(TestActivationClient); | 52 DISALLOW_COPY_AND_ASSIGN(TestActivationClient); |
51 }; | 53 }; |
52 | 54 |
53 } // namespace test | 55 } // namespace test |
54 } // namespace aura | 56 } // namespace aura |
55 | 57 |
56 #endif // UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_ | 58 #endif // UI_AURA_TEST_TEST_ACTIVATION_CLIENT_H_ |
OLD | NEW |