Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc.

views/widget/root_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/widget/root_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 286 matching lines @@
     if (v != mouse_move_handler_) {
       if (mouse_move_handler_ != NULL)
         mouse_move_handler_->OnMouseExited(e);
       mouse_move_handler_ = v;
       MouseEvent entered_event(e, this, mouse_move_handler_);
       mouse_move_handler_->OnMouseEntered(entered_event);
     }
     MouseEvent moved_event(e, this, mouse_move_handler_);
     mouse_move_handler_->OnMouseMoved(moved_event);
 
-    gfx::NativeCursor cursor = mouse_move_handler_->GetCursorForPoint(
-        moved_event.type(), moved_event.location());
-    widget_->SetCursor(cursor);
+    if (!(event.flags() & ui::EF_IS_NON_CLIENT))
+      widget_->SetCursor(mouse_move_handler_->GetCursorForPoint(
+          moved_event.type(), moved_event.location()));
   } else if (mouse_move_handler_ != NULL) {
     mouse_move_handler_->OnMouseExited(e);
-    widget_->SetCursor(NULL);
   }
 }
 
 void RootView::OnMouseExited(const MouseEvent& event) {
   if (mouse_move_handler_ != NULL) {
     mouse_move_handler_->OnMouseExited(event);
     mouse_move_handler_ = NULL;
   }
 }
 
@@ skipping 133 matching lines @@
     if (mouse_pressed_handler_->GetWidget())
       ConvertPointToView(NULL, mouse_pressed_handler_, p);
   } else
     ConvertPointToView(this, mouse_pressed_handler_, p);
   return true;
 }
 
 // Input -----------------------------------------------------------------------
 
 void RootView::UpdateCursor(const MouseEvent& event) {
+  if (event.flags() & ui::EF_IS_NON_CLIENT)
+    return;
+
   gfx::NativeCursor cursor = NULL;
+#if defined(OS_WIN)
+  static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
+  cursor = arrow;
+#endif
+
   View* v = GetEventHandlerForPoint(event.location());
   if (v && v != this) {
     gfx::Point l(event.location());
     View::ConvertPointToView(this, v, &l);
     cursor = v->GetCursorForPoint(event.type(), l);
   }
   widget_->SetCursor(cursor);
 }
 
 void RootView::SetMouseLocationAndFlags(const MouseEvent& event) {
   last_mouse_event_flags_ = event.flags();
   last_mouse_event_x_ = event.x();
   last_mouse_event_y_ = event.y();
 }
 
 }  // namespace views