Index: ui/views/controls/native/native_view_host_aura.cc |
diff --git a/ui/views/controls/native/native_view_host_aura.cc b/ui/views/controls/native/native_view_host_aura.cc |
index 3b36b987e78b29f1ff6a4092e09f454209fde20d..75c281f8c16503fd624b88730174d446b1d2ba59 100644 |
--- a/ui/views/controls/native/native_view_host_aura.cc |
+++ b/ui/views/controls/native/native_view_host_aura.cc |
@@ -26,20 +26,20 @@ class NativeViewHostAura::ClippingWindowDelegate : public aura::WindowDelegate { |
native_view_ = native_view; |
} |
- virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); } |
- virtual gfx::Size GetMaximumSize() const OVERRIDE { return gfx::Size(); } |
+ virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } |
+ virtual gfx::Size GetMaximumSize() const override { return gfx::Size(); } |
virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
- const gfx::Rect& new_bounds) OVERRIDE {} |
- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE { |
+ const gfx::Rect& new_bounds) override {} |
+ virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override { |
return gfx::kNullCursor; |
} |
- virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE { |
+ virtual int GetNonClientComponent(const gfx::Point& point) const override { |
return HTCLIENT; |
} |
virtual bool ShouldDescendIntoChildForEventHandling( |
aura::Window* child, |
- const gfx::Point& location) OVERRIDE { return true; } |
- virtual bool CanFocus() OVERRIDE { |
+ const gfx::Point& location) override { return true; } |
+ virtual bool CanFocus() override { |
// Ask the hosted native view's delegate because directly calling |
// aura::Window::CanFocus() will call back into this when checking whether |
// parents can focus. |
@@ -47,14 +47,14 @@ class NativeViewHostAura::ClippingWindowDelegate : public aura::WindowDelegate { |
? native_view_->delegate()->CanFocus() |
: true; |
} |
- virtual void OnCaptureLost() OVERRIDE {} |
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {} |
- virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE {} |
- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {} |
- virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE {} |
- virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE {} |
- virtual bool HasHitTestMask() const OVERRIDE { return false; } |
- virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE {} |
+ virtual void OnCaptureLost() override {} |
+ virtual void OnPaint(gfx::Canvas* canvas) override {} |
+ virtual void OnDeviceScaleFactorChanged(float device_scale_factor) override {} |
+ virtual void OnWindowDestroying(aura::Window* window) override {} |
+ virtual void OnWindowDestroyed(aura::Window* window) override {} |
+ virtual void OnWindowTargetVisibilityChanged(bool visible) override {} |
+ virtual bool HasHitTestMask() const override { return false; } |
+ virtual void GetHitTestMask(gfx::Path* mask) const override {} |
private: |
aura::Window* native_view_; |