From a74e3540d4fd6c65b9b97d879d0a346ed2c60cd2 Mon Sep 17 00:00:00 2001 From: dcheng Date: Mon, 27 Oct 2014 14:15:05 -0700 Subject: 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=avi@chromium.org Review URL: https://codereview.chromium.org/681873003 Cr-Commit-Position: refs/heads/master@{#301447} --- ui/wm/public/scoped_tooltip_disabler.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/wm/public') diff --git a/ui/wm/public/scoped_tooltip_disabler.h b/ui/wm/public/scoped_tooltip_disabler.h index 1022788..82d9879 100644 --- a/ui/wm/public/scoped_tooltip_disabler.h +++ b/ui/wm/public/scoped_tooltip_disabler.h @@ -17,14 +17,14 @@ class AURA_EXPORT ScopedTooltipDisabler : aura::WindowObserver { // are reenabled from the destructor when there are no most outstanding // ScopedTooltipDisablers for |window|. explicit ScopedTooltipDisabler(aura::Window* window); - virtual ~ScopedTooltipDisabler(); + ~ScopedTooltipDisabler() override; private: // Reenables the tooltips on the TooltipClient. void EnableTooltips(); // aura::WindowObserver: - virtual void OnWindowDestroying(aura::Window* window) override; + void OnWindowDestroying(aura::Window* window) override; // The RootWindow to disable Tooltips on; NULL if the Window passed to the // constructor was not in a root or the root has been destroyed. -- cgit v1.1