Fix windows Aura bustage.TBR=saintlouBUG=noneTEST=none

Review URL: http://codereview.chromium.org/8098004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103483 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 15 insertions, 10 deletions

diff --git a/ui/gfx/native_widget_types.h b/ui/gfx/native_widget_types.h
index d973c12..55aa1c7 100644
--- a/ui/gfx/native_widget_types.h
+++ b/ui/gfx/native_widget_types.h
@@ -92,18 +92,29 @@ namespace gfx {
 #if defined(USE_AURA)
 typedef aura::Window* NativeView;
 typedef aura::Window* NativeWindow;
+typedef SkRegion* NativeRegion;
 #elif defined(OS_WIN)
 typedef HWND NativeView;
 typedef HWND NativeWindow;
+typedef HRGN NativeRegion;
 #elif defined(OS_MACOSX)
 typedef NSView* NativeView;
 typedef NSWindow* NativeWindow;
 #elif defined(USE_WAYLAND)
 typedef ui::WaylandWindow* NativeView;
 typedef ui::WaylandWindow* NativeWindow;
+// TODO(dnicoara) This should be replaced with a cairo region or maybe
+// a Wayland specific region
+typedef GdkRegion* NativeRegion;
+#elif defined(TOOLKIT_USES_GTK)
+typedef GdkRegion* NativeRegion;
 #elif defined(USE_X11)
 typedef GtkWidget* NativeView;
 typedef GtkWindow* NativeWindow;
+#elif defined(OS_ANDROID)
+typedef ChromeView* NativeView;
+typedef ChromeView* NativeWindow;
+typedef void* NativeRegion;
 #endif
 
 #if defined(OS_WIN)
@@ -112,7 +123,6 @@ typedef HWND NativeEditView;
 typedef HDC NativeDrawingContext;
 typedef HCURSOR NativeCursor;
 typedef HMENU NativeMenu;
-typedef HRGN NativeRegion;
 typedef IAccessible* NativeViewAccessible;
 #elif defined(OS_MACOSX)
 typedef NSFont* NativeFont;
@@ -127,9 +137,6 @@ typedef void* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
-// TODO(dnicoara) This should be replaced with a cairo region or maybe
-// a Wayland specific region
-typedef GdkRegion* NativeRegion;
 typedef void* NativeViewAccessible;
 #elif defined(TOOLKIT_USES_GTK)
 typedef PangoFontDescription* NativeFont;
@@ -137,7 +144,6 @@ typedef GtkWidget* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef GdkCursor* NativeCursor;
 typedef GtkWidget* NativeMenu;
-typedef GdkRegion* NativeRegion;
 typedef void* NativeViewAccessible;
 #elif defined(USE_AURA)
 typedef PangoFontDescription* NativeFont;
@@ -145,17 +151,13 @@ typedef void* NativeEditView;
 typedef cairo_t* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
-typedef SkRegion* NativeRegion;
 typedef void* NativeViewAccessible;
 #elif defined(OS_ANDROID)
 typedef void* NativeFont;
-typedef ChromeView* NativeView;
-typedef ChromeView* NativeWindow;
 typedef void* NativeEditView;
 typedef void* NativeDrawingContext;
 typedef void* NativeCursor;
 typedef void* NativeMenu;
-typedef void* NativeRegion;
 typedef void* NativeViewAccessible;
 #endif
 
diff --git a/ui/ui.gyp b/ui/ui.gyp
index bfe377f..1dcae74 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -319,6 +319,7 @@
         ['use_aura==1 and OS=="win"', {
           'sources/': [
             ['exclude', 'base/dragdrop/os_exchange_data_provider_aura.cc'],
+            ['exclude', 'gfx/path_win.cc'],
           ],
         }],
         ['use_glib == 1', {
diff --git a/views/view.cc b/views/view.cc
index 338db86..6e6a4de 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -731,7 +731,9 @@ bool View::HitTest(const gfx::Point& l) const {
       gfx::Path mask;
       GetHitTestMask(&mask);
       // TODO: can this use SkRegion's contains instead?
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+      NOTIMPLEMENTED();
+#elif defined(OS_WIN)
       base::win::ScopedRegion rgn(mask.CreateNativeRegion());
       return !!PtInRegion(rgn, l.x(), l.y());
 #elif defined(TOOLKIT_USES_GTK)