Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc.

views/view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 751 matching lines @@
     gfx::Point point_in_child_coords(point);
     View::ConvertPointToView(this, child, &point_in_child_coords);
     if (child->HitTest(point_in_child_coords))
       return child->GetEventHandlerForPoint(point_in_child_coords);
   }
   return this;
 }
 
 gfx::NativeCursor View::GetCursorForPoint(ui::EventType event_type,
                                           const gfx::Point& p) {
+#if defined(OS_WIN)
+  static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
+  return arrow;
+#else
   return NULL;
+#endif
 }
 
 bool View::HitTest(const gfx::Point& l) const {
-  if (l.x() >= 0 && l.x() < width() && l.y() >= 0 && l.y() < height()) {
+  if (GetLocalBounds().Contains(l)) {
     if (HasHitTestMask()) {
       gfx::Path mask;
       GetHitTestMask(&mask);
       // TODO: can this use SkRegion's contains instead?
 #if defined(OS_WIN)
       base::win::ScopedRegion rgn(mask.CreateNativeRegion());
       return !!PtInRegion(rgn, l.x(), l.y());
 #elif defined(TOOLKIT_USES_GTK)
       ui::ScopedRegion rgn(mask.CreateNativeRegion());
       return gdk_region_point_in(rgn.Get(), l.x(), l.y());
@@ skipping 960 matching lines @@
 
   OSExchangeData data;
   WriteDragData(press_pt, &data);
 
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   GetWidget()->RunShellDrag(this, data, drag_operations);
 }
 
 }  // namespace views