Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc.

chrome/browser/chromeos/login/user_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 "chrome/browser/chromeos/login/user_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/rounded_view.h"
@@ skipping 130 matching lines @@
     SetEnabledColor(SK_ColorWHITE);
     SetDisabledColor(SK_ColorWHITE);
     SetHighlightColor(SK_ColorWHITE);
     SetHoverColor(SK_ColorWHITE);
     SetIcon(icon_);
     UpdatePosition();
   }
 
  protected:
   // Overridden from View:
-  virtual void OnMouseExited(const views::MouseEvent& event) {
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE {
     SetIcon(icon_);
     views::TextButton::SetText(std::wstring());
     ClearMaxTextSize();
     set_background(NULL);
     set_border(new views::TextButtonBorder);
     UpdatePosition();
     views::TextButton::OnMouseExited(event);
     was_first_click_ = false;
   }
 
-  void NotifyClick(const views::Event& event) {
+  virtual void NotifyClick(const views::Event& event) OVERRIDE {
     if (!was_first_click_) {
       // On first click transform image to "remove" label.
       SetIcon(SkBitmap());
       views::TextButton::SetText(text_);
 
       const SkColor kStrokeColor = SK_ColorWHITE;
       const SkColor kButtonColor = 0xFFE94949;
       const int kStrokeWidth = 1;
       const int kVerticalPadding = 4;
       const int kHorizontalPadding = 8;
@@ skipping 10 matching lines @@
                                            kHorizontalPadding));
 
       UpdatePosition();
       was_first_click_ = true;
     } else {
       // On second click propagate to base class to fire ButtonPressed.
       views::TextButton::NotifyClick(event);
     }
   }
 
-  void SetText(const std::wstring& text) {
+  virtual void SetText(const std::wstring& text) OVERRIDE {
     text_ = text;
   }
 
  private:
   // Update button position and schedule paint event for the view and parent.
   void UpdatePosition() {
     gfx::Size size = GetPreferredSize();
     gfx::Point origin = top_right_;
     origin.Offset(-size.width(), 0);
     SetBoundsRect(gfx::Rect(origin, size));
@@ skipping 16 matching lines @@
       : delegate_(delegate) { }
 
   void SetImage(const SkBitmap& image, const SkBitmap& image_hot) {
     image_ = image;
     image_hot_ = image_hot;
     views::ImageView::SetImage(image_);
   }
 
  protected:
   // Overridden from View:
-  virtual void OnMouseEntered(const views::MouseEvent& event) {
+  virtual void OnMouseEntered(const views::MouseEvent& event) OVERRIDE {
     views::ImageView::SetImage(image_hot_);
   }
 
-  virtual void OnMouseExited(const views::MouseEvent& event) {
+  virtual void OnMouseExited(const views::MouseEvent& event) OVERRIDE {
     views::ImageView::SetImage(image_);
   }
 
-  gfx::NativeCursor GetCursorForPoint(
-      ui::EventType event_type,
-      const gfx::Point& p) {
+  gfx::NativeCursor GetCursorForPoint(ui::EventType event_type,
+                                      const gfx::Point& p) OVERRIDE {
     return (delegate_->IsUserSelected()) ? NULL : gfx::GetCursor(GDK_HAND2);
   }
 
  private:
   const UserView::Delegate* delegate_;
 
   SkBitmap image_;
   SkBitmap image_hot_;
 
   DISALLOW_COPY_AND_ASSIGN(PodImageView);
@@ skipping 88 matching lines @@
     delegate_->OnRemoveUser();
 }
 
 void UserView::OnLocaleChanged() {
   remove_button_->SetText(
       UTF16ToWide(l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)));
   delegate_->OnLocaleChanged();
 }
 
 }  // namespace chromeos