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/test_focus_client.h" | 9 #include "ui/aura/test/test_focus_client.h" |
10 #include "ui/aura/window.h" | 10 #include "ui/aura/window.h" |
11 #include "ui/base/ime/text_input_focus_manager.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 #include "ui/wm/core/input_method_event_filter.h" | 14 #include "ui/wm/core/input_method_event_filter.h" |
14 | 15 |
15 namespace wm { | 16 namespace wm { |
16 | 17 |
17 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size, | 18 WMTestHelper::WMTestHelper(const gfx::Size& default_window_size, |
18 ui::ContextFactory* context_factory) { | 19 ui::ContextFactory* context_factory) { |
20 ui::TextInputFocusManager::GetInstance()->FocusTextInputClient(NULL); | |
sky
2014/06/19 20:14:06
Do you need to update any gyp dependencies?
Yuki
2014/06/20 01:30:50
Yes, you're right. I've added a dependency to ui_
| |
19 aura::Env::CreateInstance(true); | 21 aura::Env::CreateInstance(true); |
20 aura::Env::GetInstance()->set_context_factory(context_factory); | 22 aura::Env::GetInstance()->set_context_factory(context_factory); |
21 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size))); | 23 host_.reset(aura::WindowTreeHost::Create(gfx::Rect(default_window_size))); |
22 host_->InitHost(); | 24 host_->InitHost(); |
23 aura::client::SetWindowTreeClient(host_->window(), this); | 25 aura::client::SetWindowTreeClient(host_->window(), this); |
24 | 26 |
25 focus_client_.reset(new aura::test::TestFocusClient); | 27 focus_client_.reset(new aura::test::TestFocusClient); |
26 aura::client::SetFocusClient(host_->window(), focus_client_.get()); | 28 aura::client::SetFocusClient(host_->window(), focus_client_.get()); |
27 | 29 |
28 root_window_event_filter_.reset(new wm::CompoundEventFilter); | 30 root_window_event_filter_.reset(new wm::CompoundEventFilter); |
29 host_->window()->AddPreTargetHandler(root_window_event_filter_.get()); | 31 host_->window()->AddPreTargetHandler(root_window_event_filter_.get()); |
30 | 32 |
31 input_method_filter_.reset(new wm::InputMethodEventFilter( | 33 input_method_filter_.reset(new wm::InputMethodEventFilter( |
32 host_->GetAcceleratedWidget())); | 34 host_->GetAcceleratedWidget())); |
33 input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window()); | 35 input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window()); |
34 root_window_event_filter_->AddHandler(input_method_filter_.get()); | 36 root_window_event_filter_->AddHandler(input_method_filter_.get()); |
35 | 37 |
36 new wm::DefaultActivationClient(host_->window()); | 38 new wm::DefaultActivationClient(host_->window()); |
37 | 39 |
38 capture_client_.reset( | 40 capture_client_.reset( |
39 new aura::client::DefaultCaptureClient(host_->window())); | 41 new aura::client::DefaultCaptureClient(host_->window())); |
40 } | 42 } |
41 | 43 |
42 WMTestHelper::~WMTestHelper() { | 44 WMTestHelper::~WMTestHelper() { |
43 root_window_event_filter_->RemoveHandler(input_method_filter_.get()); | 45 root_window_event_filter_->RemoveHandler(input_method_filter_.get()); |
46 ui::TextInputFocusManager::GetInstance()->FocusTextInputClient(NULL); | |
44 } | 47 } |
45 | 48 |
46 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, | 49 aura::Window* WMTestHelper::GetDefaultParent(aura::Window* context, |
47 aura::Window* window, | 50 aura::Window* window, |
48 const gfx::Rect& bounds) { | 51 const gfx::Rect& bounds) { |
49 return host_->window(); | 52 return host_->window(); |
50 } | 53 } |
51 | 54 |
52 } // namespace wm | 55 } // namespace wm |
OLD | NEW |