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 <stdio.h> | 5 #include <stdio.h> |
6 #include <string> | 6 #include <string> |
7 | 7 |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 namespace mojo { | 60 namespace mojo { |
61 namespace examples { | 61 namespace examples { |
62 | 62 |
63 class MinimalInputEventFilter : public ui::internal::InputMethodDelegate, | 63 class MinimalInputEventFilter : public ui::internal::InputMethodDelegate, |
64 public ui::EventHandler { | 64 public ui::EventHandler { |
65 public: | 65 public: |
66 explicit MinimalInputEventFilter(aura::Window* root) | 66 explicit MinimalInputEventFilter(aura::Window* root) |
67 : root_(root), | 67 : root_(root), |
68 input_method_(ui::CreateInputMethod(this, | 68 input_method_(ui::CreateInputMethod(this, |
69 gfx::kNullAcceleratedWidget)) { | 69 gfx::kNullAcceleratedWidget)) { |
| 70 ui::InitializeInputMethod(); |
70 input_method_->Init(true); | 71 input_method_->Init(true); |
71 root_->AddPreTargetHandler(this); | 72 root_->AddPreTargetHandler(this); |
72 root_->SetProperty(aura::client::kRootWindowInputMethodKey, | 73 root_->SetProperty(aura::client::kRootWindowInputMethodKey, |
73 input_method_.get()); | 74 input_method_.get()); |
74 } | 75 } |
75 | 76 |
76 virtual ~MinimalInputEventFilter() { | 77 virtual ~MinimalInputEventFilter() { |
77 root_->RemovePreTargetHandler(this); | 78 root_->RemovePreTargetHandler(this); |
78 root_->SetProperty(aura::client::kRootWindowInputMethodKey, | 79 root_->SetProperty(aura::client::kRootWindowInputMethodKey, |
79 static_cast<ui::InputMethod*>(NULL)); | 80 static_cast<ui::InputMethod*>(NULL)); |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 | 295 |
295 // TODO(beng): This crashes in a DCHECK on X11 because this thread's | 296 // TODO(beng): This crashes in a DCHECK on X11 because this thread's |
296 // MessageLoop is not of TYPE_UI. I think we need a way to build | 297 // MessageLoop is not of TYPE_UI. I think we need a way to build |
297 // Aura that doesn't define platform-specific stuff. | 298 // Aura that doesn't define platform-specific stuff. |
298 aura::Env::CreateInstance(true); | 299 aura::Env::CreateInstance(true); |
299 mojo::examples::LauncherImpl launcher(shell_handle); | 300 mojo::examples::LauncherImpl launcher(shell_handle); |
300 loop.Run(); | 301 loop.Run(); |
301 | 302 |
302 return MOJO_RESULT_OK; | 303 return MOJO_RESULT_OK; |
303 } | 304 } |
OLD | NEW |