| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_WM_TEST_WM_TEST_HELPER_H_ | 5 #ifndef UI_WM_TEST_WM_TEST_HELPER_H_ |
| 6 #define UI_WM_TEST_WM_TEST_HELPER_H_ | 6 #define UI_WM_TEST_WM_TEST_HELPER_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 11 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 #include "ui/aura/client/window_tree_client.h" | 12 #include "ui/aura/client/window_tree_client.h" |
| 12 #include "ui/aura/window_tree_host.h" | 13 #include "ui/aura/window_tree_host.h" |
| 13 | 14 |
| 14 namespace aura { | 15 namespace aura { |
| 15 class Window; | 16 class Window; |
| 16 class WindowTreeHost; | 17 class WindowTreeHost; |
| 17 namespace client { | 18 namespace client { |
| 18 class DefaultCaptureClient; | 19 class DefaultCaptureClient; |
| 19 class FocusClient; | 20 class FocusClient; |
| 20 } | 21 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 43 ~WMTestHelper() override; | 44 ~WMTestHelper() override; |
| 44 | 45 |
| 45 aura::WindowTreeHost* host() { return host_.get(); } | 46 aura::WindowTreeHost* host() { return host_.get(); } |
| 46 | 47 |
| 47 // Overridden from client::WindowTreeClient: | 48 // Overridden from client::WindowTreeClient: |
| 48 aura::Window* GetDefaultParent(aura::Window* context, | 49 aura::Window* GetDefaultParent(aura::Window* context, |
| 49 aura::Window* window, | 50 aura::Window* window, |
| 50 const gfx::Rect& bounds) override; | 51 const gfx::Rect& bounds) override; |
| 51 | 52 |
| 52 private: | 53 private: |
| 53 scoped_ptr<aura::WindowTreeHost> host_; | 54 std::unique_ptr<aura::WindowTreeHost> host_; |
| 54 | 55 |
| 55 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; | 56 std::unique_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
| 56 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 57 std::unique_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 57 scoped_ptr<aura::client::FocusClient> focus_client_; | 58 std::unique_ptr<aura::client::FocusClient> focus_client_; |
| 58 | 59 |
| 59 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); | 60 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); |
| 60 }; | 61 }; |
| 61 | 62 |
| 62 } // namespace wm | 63 } // namespace wm |
| 63 | 64 |
| 64 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ | 65 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ |
| OLD | NEW |