Index: chrome/browser/ui/views/tabs/tab.cc |
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc |
index d77fc8ae387aad9415a644d86860165f10db7e94..4db7580ede410c7c6d30056092b1fa3f45b843cb 100644 |
--- a/chrome/browser/ui/views/tabs/tab.cc |
+++ b/chrome/browser/ui/views/tabs/tab.cc |
@@ -202,7 +202,7 @@ class Tab::FaviconCrashAnimation : public gfx::LinearAnimation, |
virtual ~FaviconCrashAnimation() {} |
// gfx::Animation overrides: |
- virtual void AnimateToState(double state) OVERRIDE { |
+ virtual void AnimateToState(double state) override { |
const double kHidingOffset = 27; |
if (state < .5) { |
@@ -217,7 +217,7 @@ class Tab::FaviconCrashAnimation : public gfx::LinearAnimation, |
} |
// gfx::AnimationDelegate overrides: |
- virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE { |
+ virtual void AnimationCanceled(const gfx::Animation* animation) override { |
target_->SetFaviconHidingOffset(0); |
} |
@@ -245,7 +245,7 @@ class Tab::TabCloseButton : public views::ImageButton, |
virtual ~TabCloseButton() {} |
// views::View: |
- virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) OVERRIDE { |
+ virtual View* GetTooltipHandlerForPoint(const gfx::Point& point) override { |
// Tab close button has no children, so tooltip handler should be the same |
// as the event handler. |
// In addition, a hit test has to be performed for the point (as |
@@ -255,7 +255,7 @@ class Tab::TabCloseButton : public views::ImageButton, |
return GetEventHandlerForPoint(point); |
} |
- virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE { |
+ virtual bool OnMousePressed(const ui::MouseEvent& event) override { |
tab_->controller_->OnMouseEventInTab(this, event); |
bool handled = ImageButton::OnMousePressed(event); |
@@ -264,24 +264,24 @@ class Tab::TabCloseButton : public views::ImageButton, |
return event.IsOnlyMiddleMouseButton() ? false : handled; |
} |
- virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE { |
+ virtual void OnMouseMoved(const ui::MouseEvent& event) override { |
tab_->controller_->OnMouseEventInTab(this, event); |
CustomButton::OnMouseMoved(event); |
} |
- virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE { |
+ virtual void OnMouseReleased(const ui::MouseEvent& event) override { |
tab_->controller_->OnMouseEventInTab(this, event); |
CustomButton::OnMouseReleased(event); |
} |
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE { |
+ virtual void OnGestureEvent(ui::GestureEvent* event) override { |
// Consume all gesture events here so that the parent (Tab) does not |
// start consuming gestures. |
ImageButton::OnGestureEvent(event); |
event->SetHandled(); |
} |
- virtual const char* GetClassName() const OVERRIDE { |
+ virtual const char* GetClassName() const override { |
return kTabCloseButtonName; |
} |
@@ -316,7 +316,7 @@ class Tab::TabCloseButton : public views::ImageButton, |
} |
// views::ViewTargeterDelegate: |
- virtual View* TargetForRect(View* root, const gfx::Rect& rect) OVERRIDE { |
+ virtual View* TargetForRect(View* root, const gfx::Rect& rect) override { |
CHECK_EQ(root, this); |
if (!views::UsePointBasedTargeting(rect)) |
@@ -334,7 +334,7 @@ class Tab::TabCloseButton : public views::ImageButton, |
} |
// views:MaskedTargeterDelegate: |
- virtual bool GetHitTestMask(gfx::Path* mask) const OVERRIDE { |
+ virtual bool GetHitTestMask(gfx::Path* mask) const override { |
DCHECK(mask); |
mask->reset(); |
@@ -356,7 +356,7 @@ class Tab::TabCloseButton : public views::ImageButton, |
} |
virtual bool DoesIntersectRect(const View* target, |
- const gfx::Rect& rect) const OVERRIDE { |
+ const gfx::Rect& rect) const override { |
CHECK_EQ(target, this); |
// If the request is not made in response to a gesture, use the |