diff options
author | dcheng <dcheng@chromium.org> | 2014-10-29 13:07:24 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-29 20:07:50 +0000 |
commit | bc07fa0200dee43bf23c3963357ea7fb41cd91c3 (patch) | |
tree | 237476f9f00b31535d9d5d00586db015dcc4e13e /ui/platform_window/x11/x11_window.h | |
parent | e06ac71b008ed40a81c2152382a31c23e537934d (diff) | |
download | chromium_src-bc07fa0200dee43bf23c3963357ea7fb41cd91c3.zip chromium_src-bc07fa0200dee43bf23c3963357ea7fb41cd91c3.tar.gz chromium_src-bc07fa0200dee43bf23c3963357ea7fb41cd91c3.tar.bz2 |
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states:
Explicitly annotate overrides of virtual functions or virtual
destructors with an override or (less frequently) final specifier.
Older (pre-C++11) code will use the virtual keyword as an inferior
alternative annotation. For clarity, use exactly one of override,
final, or virtual when declaring an override.
To better conform to these guidelines, the following constructs have
been rewritten:
- if a base class has a virtual destructor, then:
virtual ~Foo(); -> ~Foo() override;
- virtual void Foo() override; -> void Foo() override;
- virtual void Foo() override final; -> void Foo() final;
This patch was automatically generated. The clang plugin can generate
fixit hints, which are suggested edits when it is 100% sure it knows how
to fix a problem. The hints from the clang plugin were applied to the
source tree using the tool in https://codereview.chromium.org/598073004.
BUG=417463
R=sky@chromium.org
Review URL: https://codereview.chromium.org/670923003
Cr-Commit-Position: refs/heads/master@{#301914}
Diffstat (limited to 'ui/platform_window/x11/x11_window.h')
-rw-r--r-- | ui/platform_window/x11/x11_window.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/ui/platform_window/x11/x11_window.h b/ui/platform_window/x11/x11_window.h index 6e1184c..eb75912 100644 --- a/ui/platform_window/x11/x11_window.h +++ b/ui/platform_window/x11/x11_window.h @@ -21,7 +21,7 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow, public PlatformEventDispatcher { public: explicit X11Window(PlatformWindowDelegate* delegate); - virtual ~X11Window(); + ~X11Window() override; private: void Destroy(); @@ -29,23 +29,23 @@ class X11_WINDOW_EXPORT X11Window : public PlatformWindow, void ProcessXInput2Event(XEvent* xevent); // PlatformWindow: - virtual void Show() override; - virtual void Hide() override; - virtual void Close() override; - virtual void SetBounds(const gfx::Rect& bounds) override; - virtual gfx::Rect GetBounds() override; - virtual void SetCapture() override; - virtual void ReleaseCapture() override; - virtual void ToggleFullscreen() override; - virtual void Maximize() override; - virtual void Minimize() override; - virtual void Restore() override; - virtual void SetCursor(PlatformCursor cursor) override; - virtual void MoveCursorTo(const gfx::Point& location) override; + void Show() override; + void Hide() override; + void Close() override; + void SetBounds(const gfx::Rect& bounds) override; + gfx::Rect GetBounds() override; + void SetCapture() override; + void ReleaseCapture() override; + void ToggleFullscreen() override; + void Maximize() override; + void Minimize() override; + void Restore() override; + void SetCursor(PlatformCursor cursor) override; + void MoveCursorTo(const gfx::Point& location) override; // PlatformEventDispatcher: - virtual bool CanDispatchEvent(const PlatformEvent& event) override; - virtual uint32_t DispatchEvent(const PlatformEvent& event) override; + bool CanDispatchEvent(const PlatformEvent& event) override; + uint32_t DispatchEvent(const PlatformEvent& event) override; PlatformWindowDelegate* delegate_; |