| Index: ui/views/widget/widget.h
|
| diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
|
| index 8dcd73e06abbd9639ea888b299c3c7358600927c..0b77e167213f7c98693303947031234221598d2c 100644
|
| --- a/ui/views/widget/widget.h
|
| +++ b/ui/views/widget/widget.h
|
| @@ -261,7 +261,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| };
|
|
|
| Widget();
|
| - virtual ~Widget();
|
| + ~Widget() override;
|
|
|
| // Creates a toplevel window with no context. These methods should only be
|
| // used in cases where there is no contextual information because we're
|
| @@ -743,55 +743,54 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
|
| virtual void OnOwnerClosing();
|
|
|
| // Overridden from NativeWidgetDelegate:
|
| - virtual bool IsModal() const override;
|
| - virtual bool IsDialogBox() const override;
|
| - virtual bool CanActivate() const override;
|
| - virtual bool IsInactiveRenderingDisabled() const override;
|
| - virtual void EnableInactiveRendering() override;
|
| - virtual void OnNativeWidgetActivationChanged(bool active) override;
|
| - virtual void OnNativeFocus(gfx::NativeView old_focused_view) override;
|
| - virtual void OnNativeBlur(gfx::NativeView new_focused_view) override;
|
| - virtual void OnNativeWidgetVisibilityChanging(bool visible) override;
|
| - virtual void OnNativeWidgetVisibilityChanged(bool visible) override;
|
| - virtual void OnNativeWidgetCreated(bool desktop_widget) override;
|
| - virtual void OnNativeWidgetDestroying() override;
|
| - virtual void OnNativeWidgetDestroyed() override;
|
| - virtual gfx::Size GetMinimumSize() const override;
|
| - virtual gfx::Size GetMaximumSize() const override;
|
| - virtual void OnNativeWidgetMove() override;
|
| - virtual void OnNativeWidgetSizeChanged(const gfx::Size& new_size) override;
|
| - virtual void OnNativeWidgetWindowShowStateChanged() override;
|
| - virtual void OnNativeWidgetBeginUserBoundsChange() override;
|
| - virtual void OnNativeWidgetEndUserBoundsChange() override;
|
| - virtual bool HasFocusManager() const override;
|
| - virtual bool OnNativeWidgetPaintAccelerated(
|
| - const gfx::Rect& dirty_region) override;
|
| - virtual void OnNativeWidgetPaint(gfx::Canvas* canvas) override;
|
| - virtual int GetNonClientComponent(const gfx::Point& point) override;
|
| - virtual void OnKeyEvent(ui::KeyEvent* event) override;
|
| - virtual void OnMouseEvent(ui::MouseEvent* event) override;
|
| - virtual void OnMouseCaptureLost() override;
|
| - virtual void OnScrollEvent(ui::ScrollEvent* event) override;
|
| - virtual void OnGestureEvent(ui::GestureEvent* event) override;
|
| - virtual bool ExecuteCommand(int command_id) override;
|
| - virtual InputMethod* GetInputMethodDirect() override;
|
| - virtual const std::vector<ui::Layer*>& GetRootLayers() override;
|
| - virtual bool HasHitTestMask() const override;
|
| - virtual void GetHitTestMask(gfx::Path* mask) const override;
|
| - virtual Widget* AsWidget() override;
|
| - virtual const Widget* AsWidget() const override;
|
| - virtual bool SetInitialFocus(ui::WindowShowState show_state) override;
|
| + bool IsModal() const override;
|
| + bool IsDialogBox() const override;
|
| + bool CanActivate() const override;
|
| + bool IsInactiveRenderingDisabled() const override;
|
| + void EnableInactiveRendering() override;
|
| + void OnNativeWidgetActivationChanged(bool active) override;
|
| + void OnNativeFocus(gfx::NativeView old_focused_view) override;
|
| + void OnNativeBlur(gfx::NativeView new_focused_view) override;
|
| + void OnNativeWidgetVisibilityChanging(bool visible) override;
|
| + void OnNativeWidgetVisibilityChanged(bool visible) override;
|
| + void OnNativeWidgetCreated(bool desktop_widget) override;
|
| + void OnNativeWidgetDestroying() override;
|
| + void OnNativeWidgetDestroyed() override;
|
| + gfx::Size GetMinimumSize() const override;
|
| + gfx::Size GetMaximumSize() const override;
|
| + void OnNativeWidgetMove() override;
|
| + void OnNativeWidgetSizeChanged(const gfx::Size& new_size) override;
|
| + void OnNativeWidgetWindowShowStateChanged() override;
|
| + void OnNativeWidgetBeginUserBoundsChange() override;
|
| + void OnNativeWidgetEndUserBoundsChange() override;
|
| + bool HasFocusManager() const override;
|
| + bool OnNativeWidgetPaintAccelerated(const gfx::Rect& dirty_region) override;
|
| + void OnNativeWidgetPaint(gfx::Canvas* canvas) override;
|
| + int GetNonClientComponent(const gfx::Point& point) override;
|
| + void OnKeyEvent(ui::KeyEvent* event) override;
|
| + void OnMouseEvent(ui::MouseEvent* event) override;
|
| + void OnMouseCaptureLost() override;
|
| + void OnScrollEvent(ui::ScrollEvent* event) override;
|
| + void OnGestureEvent(ui::GestureEvent* event) override;
|
| + bool ExecuteCommand(int command_id) override;
|
| + InputMethod* GetInputMethodDirect() override;
|
| + const std::vector<ui::Layer*>& GetRootLayers() override;
|
| + bool HasHitTestMask() const override;
|
| + void GetHitTestMask(gfx::Path* mask) const override;
|
| + Widget* AsWidget() override;
|
| + const Widget* AsWidget() const override;
|
| + bool SetInitialFocus(ui::WindowShowState show_state) override;
|
|
|
| // Overridden from ui::EventSource:
|
| - virtual ui::EventProcessor* GetEventProcessor() override;
|
| + ui::EventProcessor* GetEventProcessor() override;
|
|
|
| // Overridden from FocusTraversable:
|
| - virtual FocusSearch* GetFocusSearch() override;
|
| - virtual FocusTraversable* GetFocusTraversableParent() override;
|
| - virtual View* GetFocusTraversableParentView() override;
|
| + FocusSearch* GetFocusSearch() override;
|
| + FocusTraversable* GetFocusTraversableParent() override;
|
| + View* GetFocusTraversableParentView() override;
|
|
|
| // Overridden from ui::NativeThemeObserver:
|
| - virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
|
| + void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
|
|
|
| protected:
|
| // Creates the RootView to be used within this Widget. Subclasses may override
|
|
|