| 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 c261022ce0e48e093c5fda5f9641f380c069d9c1..53cf88e79eb5a87f42f3785f4f819e9d724faa5a 100644
|
| --- a/content/browser/web_contents/aura/image_window_delegate.h
|
| +++ b/content/browser/web_contents/aura/image_window_delegate.h
|
| @@ -22,27 +22,27 @@ class CONTENT_EXPORT ImageWindowDelegate : public aura::WindowDelegate {
|
| bool has_image() const { return !image_.IsEmpty(); }
|
|
|
| protected:
|
| - virtual ~ImageWindowDelegate();
|
| + ~ImageWindowDelegate() override;
|
|
|
| // Overridden from aura::WindowDelegate:
|
| - 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;
|
| - virtual bool ShouldDescendIntoChildForEventHandling(
|
| + gfx::Size GetMinimumSize() const override;
|
| + gfx::Size GetMaximumSize() const override;
|
| + void OnBoundsChanged(const gfx::Rect& old_bounds,
|
| + const gfx::Rect& new_bounds) override;
|
| + gfx::NativeCursor GetCursor(const gfx::Point& point) override;
|
| + int GetNonClientComponent(const gfx::Point& point) const override;
|
| + 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;
|
| + bool CanFocus() override;
|
| + void OnCaptureLost() override;
|
| + void OnPaint(gfx::Canvas* canvas) override;
|
| + void OnDeviceScaleFactorChanged(float device_scale_factor) override;
|
| + void OnWindowDestroying(aura::Window* window) override;
|
| + void OnWindowDestroyed(aura::Window* window) override;
|
| + void OnWindowTargetVisibilityChanged(bool visible) override;
|
| + bool HasHitTestMask() const override;
|
| + void GetHitTestMask(gfx::Path* mask) const override;
|
|
|
| protected:
|
| gfx::Image image_;
|
|
|