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

Unified Diff: ui/gfx/native_widget_types.h

Issue 854713003: More old files deletion. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fix tryjobs? Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/mac/scoped_ns_disable_screen_updates.h ('k') | ui/gfx/nine_image_painter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/native_widget_types.h
diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index 4341b1ccf89555bbb6b87e14714e9f3dba55cff5..71a9899c189fefac17286ca2696ac3cec75d4eba 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -42,16 +42,10 @@
// 'views' and with our Chrome UI code where the elements are also called
// 'views'.
-#if defined(USE_AURA)
class SkRegion;
-namespace aura {
-class Window;
-}
namespace ui {
-class Cursor;
class Event;
}
-#endif // defined(USE_AURA)
#if defined(OS_WIN)
#include <windows.h> // NOLINT
@@ -109,27 +103,15 @@ class SkBitmap;
namespace gfx {
-#if defined(USE_AURA)
-typedef ui::Cursor NativeCursor;
-typedef aura::Window* NativeView;
-typedef aura::Window* NativeWindow;
+#if defined(OS_LINUX) || defined(OS_WIN)
typedef SkRegion* NativeRegion;
typedef ui::Event* NativeEvent;
#elif defined(OS_IOS)
-typedef void* NativeCursor;
-typedef UIView* NativeView;
-typedef UIWindow* NativeWindow;
typedef UIEvent* NativeEvent;
#elif defined(OS_MACOSX)
-typedef NSCursor* NativeCursor;
-typedef NSView* NativeView;
-typedef NSWindow* NativeWindow;
typedef void* NativeRegion;
typedef NSEvent* NativeEvent;
#elif defined(OS_ANDROID)
-typedef void* NativeCursor;
-typedef ui::ViewAndroid* NativeView;
-typedef ui::WindowAndroid* NativeWindow;
typedef void* NativeRegion;
typedef jobject NativeEvent;
#endif
@@ -170,10 +152,8 @@ typedef void* NativeViewAccessible;
#endif
// A constant value to indicate that gfx::NativeCursor refers to no cursor.
-#if defined(USE_AURA)
+#if defined(OS_LINUX) || defined(OS_WIN)
const int kNullCursor = 0;
-#else
-const gfx::NativeCursor kNullCursor = static_cast<gfx::NativeCursor>(NULL);
#endif
#if defined(OS_IOS)
« no previous file with comments | « ui/gfx/mac/scoped_ns_disable_screen_updates.h ('k') | ui/gfx/nine_image_painter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698