Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1450)

Unified Diff: chrome/browser/chromeos/login/user_view.cc

Issue 6880201: Scrap WNDCLASSEX.hCursor, update GetCursorForPoint, etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use brace style struct init for WNDCLASSEX |class_ex|, fix comment. Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/login/user_view.h ('k') | chrome/browser/chromeos/login/username_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/user_view.cc
diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc
index e20d66002e25016e816d2b48a80860bd41ac2122..811bdfb7e191cddbc6151e9cf520519bd7349808 100644
--- a/chrome/browser/chromeos/login/user_view.cc
+++ b/chrome/browser/chromeos/login/user_view.cc
@@ -148,7 +148,7 @@ class RemoveButton : public views::TextButton {
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();
@@ -159,7 +159,7 @@ class RemoveButton : public views::TextButton {
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());
@@ -190,7 +190,7 @@ class RemoveButton : public views::TextButton {
}
}
- void SetText(const std::wstring& text) {
+ virtual void SetText(const std::wstring& text) OVERRIDE {
text_ = text;
}
@@ -227,17 +227,16 @@ class PodImageView : public views::ImageView {
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);
}
« no previous file with comments | « chrome/browser/chromeos/login/user_view.h ('k') | chrome/browser/chromeos/login/username_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698