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/keyboard/keyboard_controller_proxy.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/keyboard/keyboard_controller_proxy.h')
-rw-r--r-- | ui/keyboard/keyboard_controller_proxy.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/keyboard/keyboard_controller_proxy.h b/ui/keyboard/keyboard_controller_proxy.h index f893eea..86d95b4 100644 --- a/ui/keyboard/keyboard_controller_proxy.h +++ b/ui/keyboard/keyboard_controller_proxy.h @@ -50,7 +50,7 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { }; KeyboardControllerProxy(); - virtual ~KeyboardControllerProxy(); + ~KeyboardControllerProxy() override; // Gets the virtual keyboard window. Ownership of the returned Window remains // with the proxy. @@ -113,10 +113,10 @@ class KEYBOARD_EXPORT KeyboardControllerProxy : public aura::WindowObserver { virtual void SetupWebContents(content::WebContents* contents); // aura::WindowObserver overrides: - virtual void OnWindowBoundsChanged(aura::Window* window, - const gfx::Rect& old_bounds, - const gfx::Rect& new_bounds) override; - virtual void OnWindowDestroyed(aura::Window* window) override; + void OnWindowBoundsChanged(aura::Window* window, + const gfx::Rect& old_bounds, + const gfx::Rect& new_bounds) override; + void OnWindowDestroyed(aura::Window* window) override; private: friend class TestApi; |