| Index: ui/views/controls/native/native_view_host.h
|
| diff --git a/ui/views/controls/native/native_view_host.h b/ui/views/controls/native/native_view_host.h
|
| index db8d7bb1ef40f009183aa98a5528bd8bbeb2e04e..4b4109377e3ed7317bfc174f78802c2f3635a721 100644
|
| --- a/ui/views/controls/native/native_view_host.h
|
| +++ b/ui/views/controls/native/native_view_host.h
|
| @@ -31,7 +31,7 @@ class VIEWS_EXPORT NativeViewHost : public View {
|
| static const char kViewClassName[];
|
|
|
| NativeViewHost();
|
| - virtual ~NativeViewHost();
|
| + ~NativeViewHost() override;
|
|
|
| // Attach a gfx::NativeView to this View. Its bounds will be kept in sync
|
| // with the bounds of this View until Detach is called.
|
| @@ -79,20 +79,20 @@ class VIEWS_EXPORT NativeViewHost : public View {
|
| void NativeViewDestroyed();
|
|
|
| // Overridden from View:
|
| - virtual gfx::Size GetPreferredSize() const override;
|
| - virtual void Layout() override;
|
| - virtual void OnPaint(gfx::Canvas* canvas) override;
|
| - virtual void VisibilityChanged(View* starting_from, bool is_visible) override;
|
| - virtual void OnFocus() override;
|
| - virtual gfx::NativeViewAccessible GetNativeViewAccessible() override;
|
| - virtual gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
|
| + gfx::Size GetPreferredSize() const override;
|
| + void Layout() override;
|
| + void OnPaint(gfx::Canvas* canvas) override;
|
| + void VisibilityChanged(View* starting_from, bool is_visible) override;
|
| + void OnFocus() override;
|
| + gfx::NativeViewAccessible GetNativeViewAccessible() override;
|
| + gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
|
|
|
| protected:
|
| - virtual bool GetNeedsNotificationWhenVisibleBoundsChange() const override;
|
| - virtual void OnVisibleBoundsChanged() override;
|
| - virtual void ViewHierarchyChanged(
|
| + bool GetNeedsNotificationWhenVisibleBoundsChange() const override;
|
| + void OnVisibleBoundsChanged() override;
|
| + void ViewHierarchyChanged(
|
| const ViewHierarchyChangedDetails& details) override;
|
| - virtual const char* GetClassName() const override;
|
| + const char* GetClassName() const override;
|
|
|
| private:
|
| friend class test::NativeViewHostTestBase;
|
|
|