Chromium Code Reviews| Index: ui/wm/android/window_tree_host_manager.h |
| diff --git a/ui/wm/test/wm_test_helper.h b/ui/wm/android/window_tree_host_manager.h |
| similarity index 78% |
| copy from ui/wm/test/wm_test_helper.h |
| copy to ui/wm/android/window_tree_host_manager.h |
| index c0c09f606735b1d9166c330d12aca4d0d397ce3f..1c858f6d80178fff0fef7369ca16d387b2a7f87f 100644 |
| --- a/ui/wm/test/wm_test_helper.h |
| +++ b/ui/wm/android/window_tree_host_manager.h |
| @@ -2,10 +2,11 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef UI_WM_TEST_WM_TEST_HELPER_H_ |
| -#define UI_WM_TEST_WM_TEST_HELPER_H_ |
| +#ifndef UI_WM_TEST_WM_HELPER_H_ |
| +#define UI_WM_TEST_WM_HELPER_H_ |
| #include "base/compiler_specific.h" |
| +#include "base/macros.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "ui/aura/client/window_tree_client.h" |
| #include "ui/aura/window_tree_host.h" |
| @@ -35,11 +36,11 @@ class CompoundEventFilter; |
| // Creates a minimal environment for running the shell. We can't pull in all of |
| // ash here, but we can create attach several of the same things we'd find in |
| // the ash parts of the code. |
| -class WMTestHelper : public aura::client::WindowTreeClient { |
| +class WindowTreeHostManager : public aura::client::WindowTreeClient { |
|
mfomitchev
2015/10/21 21:32:00
Perhaps we should create a common base class for W
|
| public: |
| - WMTestHelper(const gfx::Size& default_window_size, |
| - ui::ContextFactory* context_factory); |
| - ~WMTestHelper() override; |
| + WindowTreeHostManager(const gfx::Size& default_window_size, |
| + ui::ContextFactory* context_factory); |
| + ~WindowTreeHostManager() override; |
| aura::WindowTreeHost* host() { return host_.get(); } |
| @@ -55,7 +56,7 @@ class WMTestHelper : public aura::client::WindowTreeClient { |
| scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| scoped_ptr<aura::client::FocusClient> focus_client_; |
| - DISALLOW_COPY_AND_ASSIGN(WMTestHelper); |
| + DISALLOW_COPY_AND_ASSIGN(WindowTreeHostManager); |
| }; |
| } // namespace wm |