| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 type == ui::ET_TRANSLATED_KEY_RELEASE) { | 88 type == ui::ET_TRANSLATED_KEY_RELEASE) { |
| 89 // The |event| is already handled by this object, change the type of the | 89 // The |event| is already handled by this object, change the type of the |
| 90 // event to ui::ET_KEY_* and pass it to the next filter. | 90 // event to ui::ET_KEY_* and pass it to the next filter. |
| 91 static_cast<ui::TranslatedKeyEvent*>(event)->ConvertToKeyEvent(); | 91 static_cast<ui::TranslatedKeyEvent*>(event)->ConvertToKeyEvent(); |
| 92 } else { | 92 } else { |
| 93 if (input_method_->DispatchKeyEvent(*event)) | 93 if (input_method_->DispatchKeyEvent(*event)) |
| 94 event->StopPropagation(); | 94 event->StopPropagation(); |
| 95 } | 95 } |
| 96 } | 96 } |
| 97 | 97 |
| 98 // ui::InputMethodDelegate: | 98 // ui::internal::InputMethodDelegate: |
| 99 virtual bool DispatchKeyEventPostIME( | 99 virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) OVERRIDE { |
| 100 const base::NativeEvent& event) OVERRIDE { | 100 ui::TranslatedKeyEvent aura_event(event); |
| 101 ui::TranslatedKeyEvent aura_event(event, false /* is_char */); | |
| 102 return root_->GetDispatcher()->AsWindowTreeHostDelegate()->OnHostKeyEvent( | 101 return root_->GetDispatcher()->AsWindowTreeHostDelegate()->OnHostKeyEvent( |
| 103 &aura_event); | 102 &aura_event); |
| 104 } | 103 } |
| 105 | |
| 106 virtual bool DispatchFabricatedKeyEventPostIME(ui::EventType type, | |
| 107 ui::KeyboardCode key_code, | |
| 108 int flags) OVERRIDE { | |
| 109 ui::TranslatedKeyEvent aura_event(type == ui::ET_KEY_PRESSED, key_code, | |
| 110 flags); | |
| 111 return root_->GetDispatcher()->AsWindowTreeHostDelegate()->OnHostKeyEvent( | |
| 112 &aura_event); | |
| 113 } | |
| 114 | 104 |
| 115 aura::Window* root_; | 105 aura::Window* root_; |
| 116 scoped_ptr<ui::InputMethod> input_method_; | 106 scoped_ptr<ui::InputMethod> input_method_; |
| 117 | 107 |
| 118 DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter); | 108 DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter); |
| 119 }; | 109 }; |
| 120 | 110 |
| 121 class LauncherWindowTreeClient : public aura::client::WindowTreeClient { | 111 class LauncherWindowTreeClient : public aura::client::WindowTreeClient { |
| 122 public: | 112 public: |
| 123 explicit LauncherWindowTreeClient(aura::Window* window) : window_(window) { | 113 explicit LauncherWindowTreeClient(aura::Window* window) : window_(window) { |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 307 // TODO(beng): This crashes in a DCHECK on X11 because this thread's | 297 // TODO(beng): This crashes in a DCHECK on X11 because this thread's |
| 308 // MessageLoop is not of TYPE_UI. I think we need a way to build | 298 // MessageLoop is not of TYPE_UI. I think we need a way to build |
| 309 // Aura that doesn't define platform-specific stuff. | 299 // Aura that doesn't define platform-specific stuff. |
| 310 aura::Env::CreateInstance(); | 300 aura::Env::CreateInstance(); |
| 311 mojo::examples::LauncherImpl launcher( | 301 mojo::examples::LauncherImpl launcher( |
| 312 mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)).Pass()); | 302 mojo::MakeScopedHandle(mojo::MessagePipeHandle(shell_handle)).Pass()); |
| 313 loop.Run(); | 303 loop.Run(); |
| 314 | 304 |
| 315 return MOJO_RESULT_OK; | 305 return MOJO_RESULT_OK; |
| 316 } | 306 } |
| OLD | NEW |