| Index: ui/views/controls/native/native_view_host_aura.h
|
| diff --git a/ui/views/controls/native/native_view_host_aura.h b/ui/views/controls/native/native_view_host_aura.h
|
| index 05c03d578b0c4ad9860db383a795ea10bf312ca9..149bb41796e779a4d5377f17c8729b5a8e535c58 100644
|
| --- a/ui/views/controls/native/native_view_host_aura.h
|
| +++ b/ui/views/controls/native/native_view_host_aura.h
|
| @@ -24,18 +24,18 @@ class VIEWS_EXPORT NativeViewHostAura : public NativeViewHostWrapper,
|
| virtual ~NativeViewHostAura();
|
|
|
| // Overridden from NativeViewHostWrapper:
|
| - virtual void AttachNativeView() OVERRIDE;
|
| - virtual void NativeViewDetaching(bool destroyed) OVERRIDE;
|
| - virtual void AddedToWidget() OVERRIDE;
|
| - virtual void RemovedFromWidget() OVERRIDE;
|
| - virtual void InstallClip(int x, int y, int w, int h) OVERRIDE;
|
| - virtual bool HasInstalledClip() OVERRIDE;
|
| - virtual void UninstallClip() OVERRIDE;
|
| - virtual void ShowWidget(int x, int y, int w, int h) OVERRIDE;
|
| - virtual void HideWidget() OVERRIDE;
|
| - virtual void SetFocus() OVERRIDE;
|
| - virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
|
| - virtual gfx::NativeCursor GetCursor(int x, int y) OVERRIDE;
|
| + virtual void AttachNativeView() override;
|
| + virtual void NativeViewDetaching(bool destroyed) override;
|
| + virtual void AddedToWidget() override;
|
| + virtual void RemovedFromWidget() override;
|
| + virtual void InstallClip(int x, int y, int w, int h) override;
|
| + virtual bool HasInstalledClip() override;
|
| + virtual void UninstallClip() override;
|
| + virtual void ShowWidget(int x, int y, int w, int h) override;
|
| + virtual void HideWidget() override;
|
| + virtual void SetFocus() override;
|
| + virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
|
| + virtual gfx::NativeCursor GetCursor(int x, int y) override;
|
|
|
| private:
|
| friend class NativeViewHostAuraTest;
|
| @@ -43,8 +43,8 @@ class VIEWS_EXPORT NativeViewHostAura : public NativeViewHostWrapper,
|
| class ClippingWindowDelegate;
|
|
|
| // Overridden from aura::WindowObserver:
|
| - 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;
|
|
|
| // Reparents the native view with the clipping window existing between it and
|
| // its old parent, so that the fast resize path works.
|
|
|