summaryrefslogtreecommitdiffstats
path: root/ash/root_window_controller.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 16:57:05 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 23:58:04 +0000
commit1f4538e02ae35659abf7f9468639a1045924af50 (patch)
tree1e076638bbebe64689099c5ea5bd82bfa9c6b9aa /ash/root_window_controller.cc
parente19d49ab07f57c16eb6685e7394ac4902e53382c (diff)
downloadchromium_src-1f4538e02ae35659abf7f9468639a1045924af50.zip
chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.tar.gz
chromium_src-1f4538e02ae35659abf7f9468639a1045924af50.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=derat@chromium.org Review URL: https://codereview.chromium.org/680153002 Cr-Commit-Position: refs/heads/master@{#301490}
Diffstat (limited to 'ash/root_window_controller.cc')
-rw-r--r--ash/root_window_controller.cc51
1 files changed, 17 insertions, 34 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index a8ba722..68e15ab 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -213,50 +213,33 @@ void SetUsesEasyResizeTargeter(aura::Window* container) {
class EmptyWindowDelegate : public aura::WindowDelegate {
public:
EmptyWindowDelegate() {}
- virtual ~EmptyWindowDelegate() {}
+ ~EmptyWindowDelegate() override {}
// aura::WindowDelegate overrides:
- virtual gfx::Size GetMinimumSize() const override {
- return gfx::Size();
- }
- virtual gfx::Size GetMaximumSize() const override {
- return gfx::Size();
- }
- virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) override {
- }
- virtual gfx::NativeCursor GetCursor(const gfx::Point& point) override {
+ gfx::Size GetMinimumSize() const override { return gfx::Size(); }
+ gfx::Size GetMaximumSize() const override { return gfx::Size(); }
+ void OnBoundsChanged(const gfx::Rect& old_bounds,
+ const gfx::Rect& new_bounds) override {}
+ gfx::NativeCursor GetCursor(const gfx::Point& point) override {
return gfx::kNullCursor;
}
- virtual int GetNonClientComponent(
- const gfx::Point& point) const override {
+ int GetNonClientComponent(const gfx::Point& point) const override {
return HTNOWHERE;
}
- virtual bool ShouldDescendIntoChildForEventHandling(
+ bool ShouldDescendIntoChildForEventHandling(
aura::Window* child,
const gfx::Point& location) override {
return false;
}
- virtual bool CanFocus() override {
- return false;
- }
- virtual void OnCaptureLost() override {
- }
- virtual void OnPaint(gfx::Canvas* canvas) override {
- }
- virtual void OnDeviceScaleFactorChanged(
- float device_scale_factor) override {
- }
- virtual void OnWindowDestroying(aura::Window* window) override {}
- virtual void OnWindowDestroyed(aura::Window* window) override {
- delete this;
- }
- virtual void OnWindowTargetVisibilityChanged(bool visible) override {
- }
- virtual bool HasHitTestMask() const override {
- return false;
- }
- virtual void GetHitTestMask(gfx::Path* mask) const override {}
+ bool CanFocus() override { return false; }
+ void OnCaptureLost() override {}
+ void OnPaint(gfx::Canvas* canvas) override {}
+ void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
+ void OnWindowDestroying(aura::Window* window) override {}
+ void OnWindowDestroyed(aura::Window* window) override { delete this; }
+ void OnWindowTargetVisibilityChanged(bool visible) override {}
+ bool HasHitTestMask() const override { return false; }
+ void GetHitTestMask(gfx::Path* mask) const override {}
private:
DISALLOW_COPY_AND_ASSIGN(EmptyWindowDelegate);