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

Side by Side Diff: views/native_types.h

Issue 6488012: Revert 74518 - Refactor TOUCH_UI to match other refactor.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 months 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
« no previous file with comments | « views/focus/accelerator_handler_touch.cc ('k') | views/touchui/gesture_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 VIEWS_NATIVE_TYPES_H_ 5 #ifndef VIEWS_NATIVE_TYPES_H_
6 #define VIEWS_NATIVE_TYPES_H_ 6 #define VIEWS_NATIVE_TYPES_H_
7 #pragma once 7 #pragma once
8 8
9 #include "ui/gfx/native_widget_types.h" 9 #include "ui/gfx/native_widget_types.h"
10 10
11 #if defined(TOUCH_UI)
12 typedef union _XEvent XEvent;
13 #elif defined(OS_LINUX)
14 typedef union _GdkEvent GdkEvent;
15 #endif
16
17 namespace views { 11 namespace views {
18 12
19 #if defined(OS_WIN) 13 #if defined(OS_WIN)
20 typedef MSG NativeEvent; 14 typedef MSG NativeEvent;
21 #endif 15 #endif
16 #if defined(OS_LINUX)
17 typedef union _GdkEvent GdkEvent;
18 typedef GdkEvent* NativeEvent;
19 #endif
22 #if defined(TOUCH_UI) 20 #if defined(TOUCH_UI)
21 typedef union _XEvent XEvent;
23 typedef XEvent* NativeEvent; 22 typedef XEvent* NativeEvent;
24 #elif defined(OS_LINUX)
25 typedef GdkEvent* NativeEvent;
26 #endif 23 #endif
27 24
28 } // namespace views 25 } // namespace views
29 26
30 #endif // VIEWS_NATIVE_TYPES_H_ 27 #endif // VIEWS_NATIVE_TYPES_H_
31 28
OLDNEW
« no previous file with comments | « views/focus/accelerator_handler_touch.cc ('k') | views/touchui/gesture_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698