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 #include "ui/wm/test/wm_test_helper.h" | 5 #include "ui/wm/test/wm_test_helper.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/input_method_glue.h" |
9 #include "ui/aura/test/test_focus_client.h" | 10 #include "ui/aura/test/test_focus_client.h" |
10 #include "ui/aura/window.h" | 11 #include "ui/aura/window.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" |
13 | 14 |
14 namespace wm { | 15 namespace wm { |
15 | 16 |
16 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size, | 17 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size, |
17 ui::ContextFactory* context_factory) { | 18 ui::ContextFactory* context_factory) { |
18 aura::Env::GetInstance()->set_context_factory(context_factory); | 19 aura::Env::GetInstance()->set_context_factory(context_factory); |
19 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size))); | 20 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size))); |
20 host_->InitHost(); | 21 host_->InitHost(); |
| 22 input_method_glue_.reset(new aura::InputMethodGlue(host_.get())); |
21 aura::client::SetWindowTreeClient(host_->window(), this); | 23 aura::client::SetWindowTreeClient(host_->window(), this); |
22 | 24 |
23 focus_client_.reset(new aura::test::TestFocusClient); | 25 focus_client_.reset(new aura::test::TestFocusClient); |
24 aura::client::SetFocusClient(host_->window(), focus_client_.get()); | 26 aura::client::SetFocusClient(host_->window(), focus_client_.get()); |
25 | 27 |
26 root_window_event_filter_.reset(new wm::CompoundEventFilter); | 28 root_window_event_filter_.reset(new wm::CompoundEventFilter); |
27 host_->window()->AddPreTargetHandler(root_window_event_filter_.get()); | 29 host_->window()->AddPreTargetHandler(root_window_event_filter_.get()); |
28 | 30 |
29 new wm::DefaultActivationClient(host_->window()); | 31 new wm::DefaultActivationClient(host_->window()); |
30 | 32 |
31 capture_client_.reset( | 33 capture_client_.reset( |
32 new aura::client::DefaultCaptureClient(host_->window())); | 34 new aura::client::DefaultCaptureClient(host_->window())); |
33 } | 35 } |
34 | 36 |
35 WMTestHelper::~WMTestHelper() { | 37 WMTestHelper::~WMTestHelper() { |
36 } | 38 } |
37 | 39 |
38 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, | 40 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, |
39 aura::Window* window, | 41 aura::Window* window, |
40 const gfx::Rect& bounds) { | 42 const gfx::Rect& bounds) { |
41 return host_->window(); | 43 return host_->window(); |
42 } | 44 } |
43 | 45 |
44 } // namespace wm | 46 } // namespace wm |
OLD | NEW |