Skip to content

GitLab

T
tangled
Commit b083507a authored by sadrul@chromium.org's avatar sadrul@chromium.org
Browse files
Options

mojo: Fix running mojo_demo_launcher with chromeos=1. 

Initialize the input-method using ui::InitializeInputMethodForTesting()
before creating the input method.

BUG=none
R=sky@chromium.org

Review URL: https://codereview.chromium.org/400713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283874 0039d316-1c4b-4281-b951-d872f2087c98
parent 4d93949d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
mojo/views/native_widget_view_manager.cc
View file @ b083507a
...@@ -40,10 +40,9 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate, ...@@ -40,10 +40,9 @@ class MinimalInputEventFilter : public ui::internal::InputMethodDelegate,
public ui::EventHandler { public ui::EventHandler {
public: public:
explicit MinimalInputEventFilter(aura::Window* root) explicit MinimalInputEventFilter(aura::Window* root)
: root_(root), : root_(root) {
input_method_(
ui::CreateInputMethod(this, gfx::kNullAcceleratedWidget).Pass()) {
ui::InitializeInputMethodForTesting(); ui::InitializeInputMethodForTesting();
input_method_ = ui::CreateInputMethod(this, gfx::kNullAcceleratedWidget);
input_method_->Init(true); input_method_->Init(true);
root_->AddPreTargetHandler(this); root_->AddPreTargetHandler(this);
root_->SetProperty(aura::client::kRootWindowInputMethodKey, root_->SetProperty(aura::client::kRootWindowInputMethodKey,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment