Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc.

chrome/browser/ui/views/content_setting_bubble_contents.cc

Index: chrome/browser/ui/views/content_setting_bubble_contents.cc
diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc
index 01261f37ac1f4fe2f0764e44f0ecfcbbe4ca949b..5011140257751b859774b8ceae48be21ff25b837 100644
--- a/chrome/browser/ui/views/content_setting_bubble_contents.cc
+++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc
@@ -50,10 +50,6 @@ class ContentSettingBubbleContents::Favicon : public views::ImageView {
   virtual ~Favicon();
 
  private:
-#if defined(OS_WIN)
-  static HCURSOR g_hand_cursor;
-#endif
-
   // views::View overrides:
   virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
@@ -64,10 +60,6 @@ class ContentSettingBubbleContents::Favicon : public views::ImageView {
   views::Link* link_;
 };
 
-#if defined(OS_WIN)
-HCURSOR ContentSettingBubbleContents::Favicon::g_hand_cursor = NULL;
-#endif
-
 ContentSettingBubbleContents::Favicon::Favicon(
     const SkBitmap& image,
     ContentSettingBubbleContents* parent,
@@ -97,8 +89,7 @@ gfx::NativeCursor ContentSettingBubbleContents::Favicon::GetCursorForPoint(
     ui::EventType event_type,
     const gfx::Point& p) {
 #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);