Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc.

views/controls/link.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/controls/link.h"
 
 #include "build/build_config.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
@@ skipping 45 matching lines @@
   } else {
     *highlighted_color = kHighlightedColor;
     *disabled_color = kDisabledColor;
     *normal_color = kNormalColor;
   }
 }
 }
 
 namespace views {
 
-#if defined(OS_WIN)
-static HCURSOR g_hand_cursor = NULL;
-#endif
-
 const char Link::kViewClassName[] = "views/Link";
 
 Link::Link() : Label(L""),
                listener_(NULL),
                highlighted_(false) {
   Init();
   SetFocusable(true);
 }
 
 Link::Link(const std::wstring& title) : Label(title),
@@ skipping 70 matching lines @@
 void Link::GetAccessibleState(ui::AccessibleViewState* state) {
   Label::GetAccessibleState(state);
   state->role = ui::AccessibilityTypes::ROLE_LINK;
 }
 
 void Link::SetFont(const gfx::Font& font) {
   Label::SetFont(font);
   ValidateStyle();
 }
 
-void Link::SetEnabled(bool f) {
-  if (f != enabled_) {
-    enabled_ = f;
+void Link::SetEnabled(bool flag) {
+  if (flag != enabled_) {
+    enabled_ = flag;
     ValidateStyle();
     SchedulePaint();
   }
 }
 
 gfx::NativeCursor Link::GetCursorForPoint(ui::EventType event_type,
                                           const gfx::Point& p) {
   if (!enabled_)
     return NULL;
 #if defined(OS_WIN)
-  if (!g_hand_cursor)
-    g_hand_cursor = LoadCursor(NULL, IDC_HAND);
+  static HCURSOR g_hand_cursor = LoadCursor(NULL, IDC_HAND);
   return g_hand_cursor;
 #elif defined(OS_LINUX)
   return gfx::GetCursor(GDK_HAND2);
 #endif
 }
 
 std::string Link::GetClassName() const {
   return kViewClassName;
 }
 
@@ skipping 35 matching lines @@
   } else {
     if (font().GetStyle() & gfx::Font::UNDERLINED) {
       Label::SetFont(
           font().DeriveFont(0, font().GetStyle() & ~gfx::Font::UNDERLINED));
     }
     Label::SetColor(disabled_color_);
   }
 }
 
 }  // namespace views