Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Side by Side Diff: base/event_types.h

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aura_win fix Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef BASE_EVENT_TYPES_H 5 #ifndef BASE_EVENT_TYPES_H
6 #define BASE_EVENT_TYPES_H 6 #define BASE_EVENT_TYPES_H
James Su 2011/11/24 03:57:03 Perhaps it's better to rename this file to somethi
Yusuke Sato 2011/11/28 06:29:40 Probably, but let's do it in a separate CL.
7 #pragma once 7 #pragma once
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 10
11 #if defined(OS_WIN) 11 #if defined(OS_WIN)
12 #include <windows.h> 12 #include <windows.h>
13 #elif defined(USE_WAYLAND) 13 #elif defined(USE_WAYLAND)
14 namespace base { 14 namespace base {
15 namespace wayland { 15 namespace wayland {
16 union WaylandEvent; 16 union WaylandEvent;
17 } 17 }
18 } 18 }
19 #elif defined(USE_X11) 19 #elif defined(USE_X11)
20 #include <X11/Xdefs.h> // for XID
20 typedef union _XEvent XEvent; 21 typedef union _XEvent XEvent;
21 #endif 22 #endif
22 23
23 namespace base { 24 namespace base {
24 25
25 // Cross platform typedefs for native event types. 26 // Cross platform typedefs for native event types.
26 #if defined(OS_WIN) 27 #if defined(OS_WIN)
27 typedef MSG NativeEvent; 28 typedef MSG NativeEvent;
29 typedef HWND NativeWindow;
28 #elif defined(USE_WAYLAND) 30 #elif defined(USE_WAYLAND)
29 typedef wayland::WaylandEvent* NativeEvent; 31 typedef wayland::WaylandEvent* NativeEvent;
32 // TODO: typedef NativeWindow.
James Su 2011/11/24 03:57:03 WaylandWindow is in ui/, perhaps we need move nati
30 #elif defined(USE_X11) 33 #elif defined(USE_X11)
31 typedef XEvent* NativeEvent; 34 typedef XEvent* NativeEvent;
35 typedef XID NativeWindow;
32 #else 36 #else
33 typedef void* NativeEvent; 37 typedef void* NativeEvent;
38 typedef void* NativeWindow;
34 #endif 39 #endif
35 40
36 } // namespace base 41 } // namespace base
37 42
38 #endif // BASE_EVENT_TYPES_H 43 #endif // BASE_EVENT_TYPES_H
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/native_web_keyboard_event_aura.cc » ('j') | ui/base/ime/input_method_base.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698