| 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 } else { | 91 } else { |
| 92 if (input_method_->DispatchKeyEvent(*event)) | 92 if (input_method_->DispatchKeyEvent(*event)) |
| 93 event->StopPropagation(); | 93 event->StopPropagation(); |
| 94 } | 94 } |
| 95 } | 95 } |
| 96 | 96 |
| 97 // ui::internal::InputMethodDelegate: | 97 // ui::internal::InputMethodDelegate: |
| 98 virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) OVERRIDE { | 98 virtual bool DispatchKeyEventPostIME(const ui::KeyEvent& event) OVERRIDE { |
| 99 ui::TranslatedKeyEvent aura_event(event); | 99 ui::TranslatedKeyEvent aura_event(event); |
| 100 ui::EventDispatchDetails details = | 100 ui::EventDispatchDetails details = |
| 101 root_->GetDispatcher()->OnEventFromSource(&aura_event); | 101 root_->GetHost()->dispatcher()->OnEventFromSource(&aura_event); |
| 102 return aura_event.handled() || details.dispatcher_destroyed; | 102 return aura_event.handled() || details.dispatcher_destroyed; |
| 103 } | 103 } |
| 104 | 104 |
| 105 aura::Window* root_; | 105 aura::Window* root_; |
| 106 scoped_ptr<ui::InputMethod> input_method_; | 106 scoped_ptr<ui::InputMethod> input_method_; |
| 107 | 107 |
| 108 DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter); | 108 DISALLOW_COPY_AND_ASSIGN(MinimalInputEventFilter); |
| 109 }; | 109 }; |
| 110 | 110 |
| 111 class LauncherWindowTreeClient : public aura::client::WindowTreeClient { | 111 class LauncherWindowTreeClient : public aura::client::WindowTreeClient { |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 296 | 296 |
| 297 // 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 |
| 298 // 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 |
| 299 // Aura that doesn't define platform-specific stuff. | 299 // Aura that doesn't define platform-specific stuff. |
| 300 aura::Env::CreateInstance(); | 300 aura::Env::CreateInstance(); |
| 301 mojo::examples::LauncherImpl launcher(shell_handle); | 301 mojo::examples::LauncherImpl launcher(shell_handle); |
| 302 loop.Run(); | 302 loop.Run(); |
| 303 | 303 |
| 304 return MOJO_RESULT_OK; | 304 return MOJO_RESULT_OK; |
| 305 } | 305 } |
| OLD | NEW |