| 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_AURA_TEST_BASE_H_ | 5 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_ |
| 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ | 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 const display::Display& display) override; | 109 const display::Display& display) override; |
| 110 void OnWmDisplayRemoved(Window* window) override; | 110 void OnWmDisplayRemoved(Window* window) override; |
| 111 void OnWmDisplayModified(const display::Display& display) override; | 111 void OnWmDisplayModified(const display::Display& display) override; |
| 112 ui::mojom::EventResult OnAccelerator(uint32_t id, | 112 ui::mojom::EventResult OnAccelerator(uint32_t id, |
| 113 const ui::Event& event) override; | 113 const ui::Event& event) override; |
| 114 void OnWmPerformMoveLoop(Window* window, | 114 void OnWmPerformMoveLoop(Window* window, |
| 115 ui::mojom::MoveLoopSource source, | 115 ui::mojom::MoveLoopSource source, |
| 116 const gfx::Point& cursor_location, | 116 const gfx::Point& cursor_location, |
| 117 const base::Callback<void(bool)>& on_done) override; | 117 const base::Callback<void(bool)>& on_done) override; |
| 118 void OnWmCancelMoveLoop(Window* window) override; | 118 void OnWmCancelMoveLoop(Window* window) override; |
| 119 client::FocusClient* GetFocusClient() override; | |
| 120 client::CaptureClient* GetCaptureClient() override; | 119 client::CaptureClient* GetCaptureClient() override; |
| 121 PropertyConverter* GetPropertyConverter() override; | 120 PropertyConverter* GetPropertyConverter() override; |
| 122 | 121 |
| 123 private: | 122 private: |
| 124 // Only used for mus. Both are are initialized to this, but may be reset. | 123 // Only used for mus. Both are are initialized to this, but may be reset. |
| 125 WindowManagerDelegate* window_manager_delegate_; | 124 WindowManagerDelegate* window_manager_delegate_; |
| 126 WindowTreeClientDelegate* window_tree_client_delegate_; | 125 WindowTreeClientDelegate* window_tree_client_delegate_; |
| 127 | 126 |
| 128 bool use_mus_ = false; | 127 bool use_mus_ = false; |
| 129 bool setup_called_ = false; | 128 bool setup_called_ = false; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 148 private: | 147 private: |
| 149 bool setup_called_ = false; | 148 bool setup_called_ = false; |
| 150 | 149 |
| 151 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType); | 150 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType); |
| 152 }; | 151 }; |
| 153 | 152 |
| 154 } // namespace test | 153 } // namespace test |
| 155 } // namespace aura | 154 } // namespace aura |
| 156 | 155 |
| 157 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ | 156 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ |
| OLD | NEW |