summaryrefslogtreecommitdiffstats
path: root/ui/aura/window_tree_host_ozone.h
diff options
context:
space:
mode:
authorgunsch <gunsch@chromium.org>2015-01-05 17:00:32 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-06 01:01:36 +0000
commit0cffcfcc81a27345965a05ad0654d7d5ccd9eea9 (patch)
treeffbc800882ffb5342acd4f9db26524d4419e7efc /ui/aura/window_tree_host_ozone.h
parentcc60743c0fda1b9502d56439760471d01b80a96e (diff)
downloadchromium_src-0cffcfcc81a27345965a05ad0654d7d5ccd9eea9.zip
chromium_src-0cffcfcc81a27345965a05ad0654d7d5ccd9eea9.tar.gz
chromium_src-0cffcfcc81a27345965a05ad0654d7d5ccd9eea9.tar.bz2
virtual/override specifier cleanup in ui/ (mostly Ozone code).
These are changes detected by Chromecast not covered by the Linux build. See: https://codereview.chromium.org/831863003 R=sky@chromium.org,spang@chromium.org BUG=417463 Review URL: https://codereview.chromium.org/808333004 Cr-Commit-Position: refs/heads/master@{#310019}
Diffstat (limited to 'ui/aura/window_tree_host_ozone.h')
-rw-r--r--ui/aura/window_tree_host_ozone.h47
1 files changed, 23 insertions, 24 deletions
diff --git a/ui/aura/window_tree_host_ozone.h b/ui/aura/window_tree_host_ozone.h
index 1c33bb0..716ff7a 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_;