Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc.

chrome/browser/chromeos/login/shutdown_button.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 "chrome/browser/chromeos/login/shutdown_button.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/power_library.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
@@ skipping 25 matching lines @@
 // Rounded corner radious.
 const int kCornerRadius = 4;
 
 class HoverBackground : public views::Background {
  public:
   HoverBackground(views::Background* normal, views::Background* hover)
       : normal_(normal), hover_(hover) {
   }
 
   // views::Background implementation.
-  virtual void Paint(gfx::Canvas* canvas, views::View* view) const {
+  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
     views::TextButton* button = static_cast<views::TextButton*>(view);
     if (button->state() == views::CustomButton::BS_HOT) {
       hover_->Paint(canvas, view);
     } else {
       normal_->Paint(canvas, view);
     }
   }
 
  private:
   views::Background* normal_;
@@ skipping 50 matching lines @@
 }
 
 void ShutdownButton::OnLocaleChanged() {
   SetText(UTF8ToWide(l10n_util::GetStringUTF8(IDS_SHUTDOWN_BUTTON)));
   if (parent()) {
     parent()->Layout();
     parent()->SchedulePaint();
   }
 }
 
-gfx::NativeCursor ShutdownButton::GetCursorForPoint(
-    ui::EventType event_type,
-    const gfx::Point& p) {
-  if (!IsEnabled()) {
-    return NULL;
-  }
-  return gfx::GetCursor(GDK_HAND2);
+gfx::NativeCursor ShutdownButton::GetCursorForPoint(ui::EventType event_type,
+                                                    const gfx::Point& p) {
+  return IsEnabled() ? gfx::GetCursor(GDK_HAND2) : NULL;
 }
 
 void ShutdownButton::ButtonPressed(views::Button* sender,
                                    const views::Event& event) {
   DCHECK(CrosLibrary::Get()->EnsureLoaded());
   CrosLibrary::Get()->GetPowerLibrary()->RequestShutdown();
 }
 
 }  // namespace chromeos