| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| index 3340fb214352bed290c3bed577ebc608ecabb1f2..e45eb4d50a03d1f76c13a21e2424e2676b60b2d2 100644
|
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
|
| @@ -96,9 +96,6 @@
|
| // Ensures that the correct window is activated/deactivated based on whether
|
| // we are being activated/deactivated.
|
| void HandleActivationChanged(bool active);
|
| -
|
| - // Overridden from internal::NativeWidgetPrivate:
|
| - void SetNativeWindowProperty(const char* name, void* value) override;
|
|
|
| protected:
|
| // Overridden from internal::NativeWidgetPrivate:
|
| @@ -117,6 +114,7 @@
|
| const ui::Layer* GetLayer() const override;
|
| void ReorderNativeViews() override;
|
| void ViewRemoved(View* view) override;
|
| + void SetNativeWindowProperty(const char* name, void* value) override;
|
| void* GetNativeWindowProperty(const char* name) const override;
|
| TooltipManager* GetTooltipManager() const override;
|
| void SetCapture() override;
|
|
|