Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc.

views/widget/widget_win.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/widget/widget_win.h"
 
 #include <dwmapi.h>
 
 #include "base/string_util.h"
 #include "base/win/windows_version.h"
@@ skipping 127 matching lines @@
       active_mouse_tracking_flags_(0),
       use_layered_buffer_(false),
       layered_alpha_(255),
       ALLOW_THIS_IN_INITIALIZER_LIST(paint_layered_window_factory_(this)),
       delete_on_destroy_(true),
       can_update_layered_window_(true),
       is_window_(false),
       restore_focus_when_enabled_(false),
       accessibility_view_events_index_(-1),
       accessibility_view_events_(kMaxAccessibilityViewEvents),
-      previous_cursor_(NULL),
       is_input_method_win_(false) {
   set_native_widget(this);
 }
 
 WidgetWin::~WidgetWin() {
   // We need to delete the input method before calling DestroyRootView(),
   // because it'll set focus_manager_ to NULL.
   input_method_.reset();
   DestroyRootView();
 }
@@ skipping 326 matching lines @@
           &WidgetWin::RedrawLayeredWindowContents));
     }
   } else {
     // InvalidateRect() expects client coordinates.
     RECT r = rect.ToRECT();
     InvalidateRect(hwnd(), &r, FALSE);
   }
 }
 
 void WidgetWin::SetCursor(gfx::NativeCursor cursor) {
-  if (cursor) {
-    previous_cursor_ = ::SetCursor(cursor);
-  } else if (previous_cursor_) {
-    ::SetCursor(previous_cursor_);
-    previous_cursor_ = NULL;
-  }
+  ::SetCursor(cursor);
 }
 
 void WidgetWin::NotifyAccessibilityEvent(
     View* view,
     ui::AccessibilityTypes::Event event_type,
     bool send_native_event) {
   // Send the notification to the delegate.
   if (ViewsDelegate::views_delegate)
     ViewsDelegate::views_delegate->NotifyAccessibilityEvent(view, event_type);
 
@@ skipping 725 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (NativeWidgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->GetWidget()->NotifyNativeViewHierarchyChanged(true,
                                                          new_parent);
   }
 }
 
 }  // namespace views