summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.cc
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-03 09:23:45 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-03 16:24:05 +0000
commit10d6b38a855066b1400d96d0600c6e2aec42cbf1 (patch)
tree8df573d9a31973c64cd9c50e9a2a6a6fa5c49e82 /ash/root_window_controller.cc
parent90b32ca95485409ba5646c96a4ec0aa4b6216aee (diff)
downloadchromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.zip
chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.gz
chromium_src-10d6b38a855066b1400d96d0600c6e2aec42cbf1.tar.bz2
replace OVERRIDE and FINAL with override and final in ash/
BUG=417463 Review URL: https://codereview.chromium.org/621133002 Cr-Commit-Position: refs/heads/master@{#298040}
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r--ash/root_window_controller.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 89bb31ea..a8ba722 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -216,47 +216,47 @@ class EmptyWindowDelegate : public aura::WindowDelegate {
virtual ~EmptyWindowDelegate() {}
// aura::WindowDelegate overrides:
- virtual gfx::Size GetMinimumSize() const OVERRIDE {
+ virtual gfx::Size GetMinimumSize() const override {
return gfx::Size();
}
- virtual gfx::Size GetMaximumSize() const OVERRIDE {
+ virtual gfx::Size GetMaximumSize() const override {
return gfx::Size();
}
virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) OVERRIDE {
+ const gfx::Rect& new_bounds) override {
}
- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE {
+ virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override {
return gfx::kNullCursor;
}
virtual int GetNonClientComponent(
- const gfx::Point& point) const OVERRIDE {
+ const gfx::Point& point) const override {
return HTNOWHERE;
}
virtual bool ShouldDescendIntoChildForEventHandling(
aura::Window* child,
- const gfx::Point& location) OVERRIDE {
+ const gfx::Point& location) override {
return false;
}
- virtual bool CanFocus() OVERRIDE {
+ virtual bool CanFocus() override {
return false;
}
- virtual void OnCaptureLost() OVERRIDE {
+ virtual void OnCaptureLost() override {
}
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+ virtual void OnPaint(gfx::Canvas* canvas) override {
}
virtual void OnDeviceScaleFactorChanged(
- float device_scale_factor) OVERRIDE {
+ float device_scale_factor) override {
}
- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {}
- virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {
+ virtual void OnWindowDestroying(aura::Window* window) override {}
+ virtual void OnWindowDestroyed(aura::Window* window) override {
delete this;
}
- virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {
+ virtual void OnWindowTargetVisibilityChanged(bool visible) override {
}
- virtual bool HasHitTestMask() const OVERRIDE {
+ virtual bool HasHitTestMask() const override {
return false;
}
- virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {}
+ virtual void GetHitTestMask(gfx::Path* mask) const override {}
private:
DISALLOW_COPY_AND_ASSIGN(EmptyWindowDelegate);