| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ui/aura/test/event_generator.h" | 5 #include "ui/aura/test/event_generator.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "ui/aura/root_window.h" | 8 #include "ui/aura/root_window.h" |
| 9 #include "ui/base/event.h" | 9 #include "ui/base/events/event.h" |
| 10 | 10 |
| 11 #if defined(USE_X11) | 11 #if defined(USE_X11) |
| 12 #include <X11/Xlib.h> | 12 #include <X11/Xlib.h> |
| 13 #include "ui/base/x/x11_util.h" | 13 #include "ui/base/x/x11_util.h" |
| 14 #endif | 14 #endif |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 class TestKeyEvent : public ui::KeyEvent { | 18 class TestKeyEvent : public ui::KeyEvent { |
| 19 public: | 19 public: |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 TestKeyEvent keyev(native_event.get(), flags); | 320 TestKeyEvent keyev(native_event.get(), flags); |
| 321 #else | 321 #else |
| 322 ui::KeyEvent keyev(type, key_code, flags); | 322 ui::KeyEvent keyev(type, key_code, flags); |
| 323 #endif // USE_X11 | 323 #endif // USE_X11 |
| 324 #endif // OS_WIN | 324 #endif // OS_WIN |
| 325 Dispatch(keyev); | 325 Dispatch(keyev); |
| 326 } | 326 } |
| 327 | 327 |
| 328 } // namespace test | 328 } // namespace test |
| 329 } // namespace aura | 329 } // namespace aura |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 10917075:
events: Move some files into ui/base/events/ (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src