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

Side by Side Diff: ui/gfx/native_widget_types.h

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « ui/base/event.cc ('k') | ui/views/controls/webview/web_dialog_view.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) 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 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_ 5 #ifndef UI_GFX_NATIVE_WIDGET_TYPES_H_
6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_ 6 #define UI_GFX_NATIVE_WIDGET_TYPES_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_ANDROID) 10 #if defined(OS_ANDROID)
(...skipping 28 matching lines...) Expand all
39 // 39 //
40 // The name 'View' here meshes with OS X where the UI elements are called 40 // The name 'View' here meshes with OS X where the UI elements are called
41 // 'views' and with our Chrome UI code where the elements are also called 41 // 'views' and with our Chrome UI code where the elements are also called
42 // 'views'. 42 // 'views'.
43 43
44 #if defined(USE_AURA) 44 #if defined(USE_AURA)
45 #include "ui/base/cursor/cursor.h" 45 #include "ui/base/cursor/cursor.h"
46 46
47 class SkRegion; 47 class SkRegion;
48 namespace aura { 48 namespace aura {
49 class Window;
50 }
51 namespace ui {
49 class Event; 52 class Event;
50 class Window;
51 } 53 }
52 #endif // defined(USE_AURA) 54 #endif // defined(USE_AURA)
53 55
54 #if defined(OS_WIN) 56 #if defined(OS_WIN)
55 #include <windows.h> // NOLINT 57 #include <windows.h> // NOLINT
56 typedef struct HFONT__* HFONT; 58 typedef struct HFONT__* HFONT;
57 struct IAccessible; 59 struct IAccessible;
58 #elif defined(OS_MACOSX) 60 #elif defined(OS_MACOSX)
59 struct CGContext; 61 struct CGContext;
60 #ifdef __OBJC__ 62 #ifdef __OBJC__
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #endif 96 #endif
95 class SkBitmap; 97 class SkBitmap;
96 98
97 namespace gfx { 99 namespace gfx {
98 100
99 #if defined(USE_AURA) 101 #if defined(USE_AURA)
100 typedef ui::Cursor NativeCursor; 102 typedef ui::Cursor NativeCursor;
101 typedef aura::Window* NativeView; 103 typedef aura::Window* NativeView;
102 typedef aura::Window* NativeWindow; 104 typedef aura::Window* NativeWindow;
103 typedef SkRegion* NativeRegion; 105 typedef SkRegion* NativeRegion;
104 typedef aura::Event* NativeEvent; 106 typedef ui::Event* NativeEvent;
105 #elif defined(OS_WIN) 107 #elif defined(OS_WIN)
106 typedef HCURSOR NativeCursor; 108 typedef HCURSOR NativeCursor;
107 typedef HWND NativeView; 109 typedef HWND NativeView;
108 typedef HWND NativeWindow; 110 typedef HWND NativeWindow;
109 typedef HRGN NativeRegion; 111 typedef HRGN NativeRegion;
110 typedef MSG NativeEvent; 112 typedef MSG NativeEvent;
111 #elif defined(OS_MACOSX) 113 #elif defined(OS_MACOSX)
112 typedef NSCursor* NativeCursor; 114 typedef NSCursor* NativeCursor;
113 typedef NSView* NativeView; 115 typedef NSView* NativeView;
114 typedef NSWindow* NativeWindow; 116 typedef NSWindow* NativeWindow;
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 #elif defined(OS_ANDROID) 285 #elif defined(OS_ANDROID)
284 typedef ANativeWindow* AcceleratedWidget; 286 typedef ANativeWindow* AcceleratedWidget;
285 const AcceleratedWidget kNullAcceleratedWidget = 0; 287 const AcceleratedWidget kNullAcceleratedWidget = 0;
286 #else 288 #else
287 #error unknown platform 289 #error unknown platform
288 #endif 290 #endif
289 291
290 } // namespace gfx 292 } // namespace gfx
291 293
292 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_ 294 #endif // UI_GFX_NATIVE_WIDGET_TYPES_H_
OLDNEW
« no previous file with comments | « ui/base/event.cc ('k') | ui/views/controls/webview/web_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698