OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "ui/wm/test/wm_test_helper.h" | 5 #include "ui/wm/android/window_tree_host_manager.h" |
6 | 6 |
7 #include "ui/aura/client/default_capture_client.h" | 7 #include "ui/aura/client/default_capture_client.h" |
8 #include "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
9 #include "ui/aura/test/test_focus_client.h" | |
10 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/wm/android/android_focus_rules.h" |
| 11 #include "ui/wm/core/base_focus_rules.h" |
11 #include "ui/wm/core/compound_event_filter.h" | 12 #include "ui/wm/core/compound_event_filter.h" |
12 #include "ui/wm/core/default_activation_client.h" | 13 #include "ui/wm/core/default_activation_client.h" |
| 14 #include "ui/wm/core/focus_controller.h" |
13 | 15 |
14 namespace wm { | 16 namespace wm { |
15 | 17 |
16 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size, | 18 WindowTreeHostManager::WindowTreeHostManager( |
17 ui::ContextFactory* context_factory) { | 19 const gfx::Size& default_window_size, |
| 20 ui::ContextFactory* context_factory) { |
18 aura::Env::CreateInstance(true); | 21 aura::Env::CreateInstance(true); |
19 aura::Env::GetInstance()->set_context_factory(context_factory); | 22 aura::Env::GetInstance()->set_context_factory(context_factory); |
20 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size))); | 23 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size))); |
21 host_->InitHost(); | 24 host_->InitHost(); |
22 aura::client::SetWindowTreeClient(host_->window(), this); | 25 aura::client::SetWindowTreeClient(host_->window(), this); |
23 | 26 |
24 focus_client_.reset(new aura::test::TestFocusClient); | 27 AndroidFocusRules* focus_rules = new AndroidFocusRules(); |
| 28 focus_client_.reset(new FocusController(focus_rules)); |
25 aura::client::SetFocusClient(host_->window(), focus_client_.get()); | 29 aura::client::SetFocusClient(host_->window(), focus_client_.get()); |
26 | 30 |
27 root_window_event_filter_.reset(new wm::CompoundEventFilter); | 31 root_window_event_filter_.reset(new wm::CompoundEventFilter); |
28 host_->window()->AddPreTargetHandler(root_window_event_filter_.get()); | 32 host_->window()->AddPreTargetHandler(root_window_event_filter_.get()); |
29 | 33 |
30 new wm::DefaultActivationClient(host_->window()); | 34 new wm::DefaultActivationClient(host_->window()); |
31 | 35 |
32 capture_client_.reset( | 36 capture_client_.reset( |
33 new aura::client::DefaultCaptureClient(host_->window())); | 37 new aura::client::DefaultCaptureClient(host_->window())); |
34 } | 38 } |
35 | 39 |
36 WMTestHelper::~WMTestHelper() { | 40 WindowTreeHostManager::~WindowTreeHostManager() {} |
37 } | |
38 | 41 |
39 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, | 42 aura::Window* WindowTreeHostManager::GetDefaultParent(aura::Window* context, |
40 aura::Window* window, | 43 aura::Window* window, |
41 const gfx::Rect& bounds) { | 44 const gfx::Rect& bounds) { |
42 return host_->window(); | 45 return host_->window(); |
43 } | 46 } |
44 | 47 |
45 } // namespace wm | 48 } // namespace wm |
OLD | NEW |