| 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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "ui/aura/test/ui_controls_factory_aura.h" | 8 #include "ui/aura/test/ui_controls_factory_aura.h" |
| 9 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
| 10 #include "ui/aura/window_event_dispatcher.h" | 10 #include "ui/aura/window_event_dispatcher.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 | 31 |
| 32 // UIControlsAura overrides: | 32 // UIControlsAura overrides: |
| 33 virtual bool SendKeyPress(gfx::NativeWindow native_window, | 33 virtual bool SendKeyPress(gfx::NativeWindow native_window, |
| 34 ui::KeyboardCode key, | 34 ui::KeyboardCode key, |
| 35 bool control, | 35 bool control, |
| 36 bool shift, | 36 bool shift, |
| 37 bool alt, | 37 bool alt, |
| 38 bool command) { | 38 bool command) { |
| 39 DCHECK(!command); // No command key on Aura | 39 DCHECK(!command); // No command key on Aura |
| 40 HWND window = | 40 HWND window = |
| 41 native_window->GetDispatcher()->host()->GetAcceleratedWidget(); | 41 native_window->GetHost()->GetAcceleratedWidget(); |
| 42 return SendKeyPressImpl( | 42 return SendKeyPressImpl( |
| 43 window, key, control, shift, alt, base::Closure()); | 43 window, key, control, shift, alt, base::Closure()); |
| 44 } | 44 } |
| 45 virtual bool SendKeyPressNotifyWhenDone(gfx::NativeWindow native_window, | 45 virtual bool SendKeyPressNotifyWhenDone(gfx::NativeWindow native_window, |
| 46 ui::KeyboardCode key, | 46 ui::KeyboardCode key, |
| 47 bool control, | 47 bool control, |
| 48 bool shift, | 48 bool shift, |
| 49 bool alt, | 49 bool alt, |
| 50 bool command, | 50 bool command, |
| 51 const base::Closure& task) { | 51 const base::Closure& task) { |
| 52 DCHECK(!command); // No command key on Aura | 52 DCHECK(!command); // No command key on Aura |
| 53 HWND window = | 53 HWND window = |
| 54 native_window->GetDispatcher()->host()->GetAcceleratedWidget(); | 54 native_window->GetHost()->GetAcceleratedWidget(); |
| 55 return SendKeyPressImpl(window, key, control, shift, alt, task); | 55 return SendKeyPressImpl(window, key, control, shift, alt, task); |
| 56 } | 56 } |
| 57 virtual bool SendMouseMove(long screen_x, long screen_y) { | 57 virtual bool SendMouseMove(long screen_x, long screen_y) { |
| 58 return SendMouseMoveImpl(screen_x, screen_y, base::Closure()); | 58 return SendMouseMoveImpl(screen_x, screen_y, base::Closure()); |
| 59 } | 59 } |
| 60 virtual bool SendMouseMoveNotifyWhenDone(long screen_x, | 60 virtual bool SendMouseMoveNotifyWhenDone(long screen_x, |
| 61 long screen_y, | 61 long screen_y, |
| 62 const base::Closure& task) { | 62 const base::Closure& task) { |
| 63 return SendMouseMoveImpl(screen_x, screen_y, task); | 63 return SendMouseMoveImpl(screen_x, screen_y, task); |
| 64 } | 64 } |
| (...skipping 18 matching lines...) Expand all Loading... |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 } // namespace | 85 } // namespace |
| 86 | 86 |
| 87 UIControlsAura* CreateUIControlsAura(WindowEventDispatcher* dispatcher) { | 87 UIControlsAura* CreateUIControlsAura(WindowEventDispatcher* dispatcher) { |
| 88 return new UIControlsWin(); | 88 return new UIControlsWin(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 } // namespace test | 91 } // namespace test |
| 92 } // namespace aura | 92 } // namespace aura |
| OLD | NEW |