| 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 "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "ui/aura/client/window_tree_client.h" | 10 #include "ui/aura/client/window_tree_client.h" |
| 11 #include "ui/aura/window_tree_host.h" | 11 #include "ui/aura/window_tree_host.h" |
| 12 | 12 |
| 13 namespace aura { | 13 namespace aura { |
| 14 class Window; | 14 class Window; |
| 15 class WindowTreeHost; | 15 class WindowTreeHost; |
| 16 namespace client { | 16 namespace client { |
| 17 class DefaultActivationClient; | |
| 18 class DefaultCaptureClient; | 17 class DefaultCaptureClient; |
| 19 class FocusClient; | 18 class FocusClient; |
| 20 } | 19 } |
| 21 } | 20 } |
| 22 | 21 |
| 23 namespace gfx { | 22 namespace gfx { |
| 24 class Rect; | 23 class Rect; |
| 25 class Size; | 24 class Size; |
| 26 } | 25 } |
| 27 | 26 |
| (...skipping 16 matching lines...) Expand all Loading... |
| 44 virtual aura::Window* GetDefaultParent(aura::Window* context, | 43 virtual aura::Window* GetDefaultParent(aura::Window* context, |
| 45 aura::Window* window, | 44 aura::Window* window, |
| 46 const gfx::Rect& bounds) OVERRIDE; | 45 const gfx::Rect& bounds) OVERRIDE; |
| 47 | 46 |
| 48 private: | 47 private: |
| 49 scoped_ptr<aura::WindowTreeHost> host_; | 48 scoped_ptr<aura::WindowTreeHost> host_; |
| 50 | 49 |
| 51 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; | 50 scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_; |
| 52 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 51 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 53 scoped_ptr<wm::InputMethodEventFilter> input_method_filter_; | 52 scoped_ptr<wm::InputMethodEventFilter> input_method_filter_; |
| 54 scoped_ptr<aura::client::DefaultActivationClient> activation_client_; | |
| 55 scoped_ptr<aura::client::FocusClient> focus_client_; | 53 scoped_ptr<aura::client::FocusClient> focus_client_; |
| 56 | 54 |
| 57 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); | 55 DISALLOW_COPY_AND_ASSIGN(WMTestHelper); |
| 58 }; | 56 }; |
| 59 | 57 |
| 60 } // namespace wm | 58 } // namespace wm |
| 61 | 59 |
| 62 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ | 60 #endif // UI_WM_TEST_WM_TEST_HELPER_H_ |
| OLD | NEW |