| Index: ui/aura/window_tree_host_ozone.h
|
| diff --git a/ui/aura/window_tree_host_ozone.h b/ui/aura/window_tree_host_ozone.h
|
| index 1c33bb0c8ba065025e65d63e6acd6a818d7766bd..716ff7a83c24b6b15fec663ee7f610c706c3d9f9 100644
|
| --- a/ui/aura/window_tree_host_ozone.h
|
| +++ b/ui/aura/window_tree_host_ozone.h
|
| @@ -22,40 +22,39 @@ class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
|
| public ui::PlatformWindowDelegate {
|
| public:
|
| explicit WindowTreeHostOzone(const gfx::Rect& bounds);
|
| - virtual ~WindowTreeHostOzone();
|
| + ~WindowTreeHostOzone() override;
|
|
|
| protected:
|
| // WindowTreeHost:
|
| - virtual gfx::Rect GetBounds() const override;
|
| + gfx::Rect GetBounds() const override;
|
|
|
| private:
|
| // ui::PlatformWindowDelegate:
|
| - virtual void OnBoundsChanged(const gfx::Rect&) override;
|
| - virtual void OnDamageRect(const gfx::Rect& damaged_region) override;
|
| - virtual void DispatchEvent(ui::Event* event) override;
|
| - virtual void OnCloseRequest() override;
|
| - virtual void OnClosed() override;
|
| - virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
|
| - virtual void OnLostCapture() override;
|
| - virtual void OnAcceleratedWidgetAvailable(
|
| - gfx::AcceleratedWidget widget) override;
|
| - virtual void OnActivationChanged(bool active) override;
|
| + void OnBoundsChanged(const gfx::Rect&) override;
|
| + void OnDamageRect(const gfx::Rect& damaged_region) override;
|
| + void DispatchEvent(ui::Event* event) override;
|
| + void OnCloseRequest() override;
|
| + void OnClosed() override;
|
| + void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
|
| + void OnLostCapture() override;
|
| + void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override;
|
| + void OnActivationChanged(bool active) override;
|
|
|
| // WindowTreeHost:
|
| - virtual ui::EventSource* GetEventSource() override;
|
| - virtual gfx::AcceleratedWidget GetAcceleratedWidget() override;
|
| - virtual void Show() override;
|
| - virtual void Hide() override;
|
| - virtual void SetBounds(const gfx::Rect& bounds) override;
|
| - virtual gfx::Point GetLocationOnNativeScreen() const override;
|
| - virtual void SetCapture() override;
|
| - virtual void ReleaseCapture() override;
|
| - virtual void SetCursorNative(gfx::NativeCursor cursor_type) override;
|
| - virtual void MoveCursorToNative(const gfx::Point& location) override;
|
| - virtual void OnCursorVisibilityChangedNative(bool show) override;
|
| + ui::EventSource* GetEventSource() override;
|
| + gfx::AcceleratedWidget GetAcceleratedWidget() override;
|
| + void Show() override;
|
| + void Hide() override;
|
| + void SetBounds(const gfx::Rect& bounds) override;
|
| + gfx::Point GetLocationOnNativeScreen() const override;
|
| + void SetCapture() override;
|
| + void ReleaseCapture() override;
|
| + void SetCursorNative(gfx::NativeCursor cursor_type) override;
|
| + void MoveCursorToNative(const gfx::Point& location) override;
|
| + void OnCursorVisibilityChangedNative(bool show) override;
|
|
|
| // ui::EventSource overrides.
|
| - virtual ui::EventProcessor* GetEventProcessor() override;
|
| + ui::EventProcessor* GetEventProcessor() override;
|
|
|
| // Platform-specific part of this WindowTreeHost.
|
| scoped_ptr<ui::PlatformWindow> platform_window_;
|
|
|