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

Unified Diff: ash/magnifier/magnification_controller.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « ash/keyboard_uma_event_filter.h ('k') | ash/magnifier/magnification_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/magnifier/magnification_controller.cc
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc
index e5119a9cc8e87b74ff388ff25901aa2426142336..a649f30d4a4fd5399624340598853f5f58208903 100644
--- a/ash/magnifier/magnification_controller.cc
+++ b/ash/magnifier/magnification_controller.cc
@@ -69,31 +69,31 @@ class MagnificationControllerImpl : virtual public MagnificationController,
virtual ~MagnificationControllerImpl();
// MagnificationController overrides:
- virtual void SetEnabled(bool enabled) OVERRIDE;
- virtual bool IsEnabled() const OVERRIDE;
- virtual void SetScale(float scale, bool animate) OVERRIDE;
- virtual float GetScale() const OVERRIDE { return scale_; }
- virtual void MoveWindow(int x, int y, bool animate) OVERRIDE;
- virtual void MoveWindow(const gfx::Point& point, bool animate) OVERRIDE;
- virtual gfx::Point GetWindowPosition() const OVERRIDE {
+ virtual void SetEnabled(bool enabled) override;
+ virtual bool IsEnabled() const override;
+ virtual void SetScale(float scale, bool animate) override;
+ virtual float GetScale() const override { return scale_; }
+ virtual void MoveWindow(int x, int y, bool animate) override;
+ virtual void MoveWindow(const gfx::Point& point, bool animate) override;
+ virtual gfx::Point GetWindowPosition() const override {
return gfx::ToFlooredPoint(origin_);
}
- virtual void SetScrollDirection(ScrollDirection direction) OVERRIDE;
+ virtual void SetScrollDirection(ScrollDirection direction) override;
// For test
- virtual gfx::Point GetPointOfInterestForTesting() OVERRIDE {
+ virtual gfx::Point GetPointOfInterestForTesting() override {
return point_of_interest_;
}
private:
// ui::ImplicitAnimationObserver overrides:
- virtual void OnImplicitAnimationsCompleted() OVERRIDE;
+ virtual void OnImplicitAnimationsCompleted() override;
// aura::WindowObserver overrides:
- virtual void OnWindowDestroying(aura::Window* root_window) OVERRIDE;
+ virtual void OnWindowDestroying(aura::Window* root_window) override;
virtual void OnWindowBoundsChanged(aura::Window* window,
const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) OVERRIDE;
+ const gfx::Rect& new_bounds) override;
// Redraws the magnification window with the given origin position and the
// given scale. Returns true if the window is changed; otherwise, false.
@@ -140,9 +140,9 @@ class MagnificationControllerImpl : virtual public MagnificationController,
void ValidateScale(float* scale);
// ui::EventHandler overrides:
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
- virtual void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
- virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
+ virtual void OnMouseEvent(ui::MouseEvent* event) override;
+ virtual void OnScrollEvent(ui::ScrollEvent* event) override;
+ virtual void OnTouchEvent(ui::TouchEvent* event) override;
// Target root window. This must not be NULL.
aura::Window* root_window_;
« no previous file with comments | « ash/keyboard_uma_event_filter.h ('k') | ash/magnifier/magnification_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698