content/browser/web_contents/aura/image_window_delegate.h - Issue 637473002: Replacing the OVERRIDE with override and FINAL with final in content/browser/geolocation/web_conten…

Unified Diff: content/browser/web_contents/aura/image_window_delegate.h

Issue 637473002: Replacing the OVERRIDE with override and FINAL with final in content/browser/geolocation/web_conten… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased the patch 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 | « content/browser/web_contents/aura/gesture_nav_simple.cc ('k') | content/browser/web_contents/aura/overscroll_navigation_overlay.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/aura/image_window_delegate.h

diff --git a/content/browser/web_contents/aura/image_window_delegate.h b/content/browser/web_contents/aura/image_window_delegate.h

index d0f9b061918ae1aa5065fe7eef4adeebdc89db1a..c261022ce0e48e093c5fda5f9641f380c069d9c1 100644

--- a/content/browser/web_contents/aura/image_window_delegate.h

+++ b/content/browser/web_contents/aura/image_window_delegate.h

@@ -25,24 +25,24 @@ class CONTENT_EXPORT ImageWindowDelegate : public aura::WindowDelegate {

virtual ~ImageWindowDelegate();

// Overridden from aura::WindowDelegate:

- virtual gfx::Size GetMinimumSize() const OVERRIDE;

- virtual gfx::Size GetMaximumSize() const OVERRIDE;

+ virtual gfx::Size GetMinimumSize() const override;

+ virtual gfx::Size GetMaximumSize() const override;

virtual void OnBoundsChanged(const gfx::Rect& old_bounds,

- const gfx::Rect& new_bounds) OVERRIDE;

- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE;

- virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;

+ const gfx::Rect& new_bounds) override;

+ virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override;

+ virtual int GetNonClientComponent(const gfx::Point& point) const override;

virtual bool ShouldDescendIntoChildForEventHandling(

aura::Window* child,

- const gfx::Point& location) OVERRIDE;

- virtual bool CanFocus() 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;

- virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;

+ const gfx::Point& location) override;

+ virtual bool CanFocus() 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;

+ virtual void GetHitTestMask(gfx::Path* mask) const override;

protected:

gfx::Image image_;