Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1014)

Unified Diff: ui/wm/core/capture_controller.h

Issue 681873003: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/wm/core/base_focus_rules.h ('k') | ui/wm/core/compound_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/capture_controller.h
diff --git a/ui/wm/core/capture_controller.h b/ui/wm/core/capture_controller.h
index 230ea50063fbc5e3fce8d4c1c4e3daafa424f344..bd9beb922a803de2935ffe0a096c759a56417d5d 100644
--- a/ui/wm/core/capture_controller.h
+++ b/ui/wm/core/capture_controller.h
@@ -29,17 +29,17 @@ class WM_EXPORT CaptureController : public aura::client::CaptureClient {
bool is_active() const { return !root_windows_.empty(); }
// Overridden from aura::client::CaptureClient:
- virtual void SetCapture(aura::Window* window) override;
- virtual void ReleaseCapture(aura::Window* window) override;
- virtual aura::Window* GetCaptureWindow() override;
- virtual aura::Window* GetGlobalCaptureWindow() override;
+ void SetCapture(aura::Window* window) override;
+ void ReleaseCapture(aura::Window* window) override;
+ aura::Window* GetCaptureWindow() override;
+ aura::Window* GetGlobalCaptureWindow() override;
private:
friend class ScopedCaptureClient;
typedef std::set<aura::Window*> RootWindows;
CaptureController();
- virtual ~CaptureController();
+ ~CaptureController() override;
// The current capture window. NULL if there is no capture window.
aura::Window* capture_window_;
@@ -56,7 +56,7 @@ class WM_EXPORT CaptureController : public aura::client::CaptureClient {
class WM_EXPORT ScopedCaptureClient : public aura::WindowObserver {
public:
explicit ScopedCaptureClient(aura::Window* root);
- virtual ~ScopedCaptureClient();
+ ~ScopedCaptureClient() override;
// Returns true if there is a CaptureController with at least one RootWindow.
static bool IsActive();
@@ -66,7 +66,7 @@ class WM_EXPORT ScopedCaptureClient : public aura::WindowObserver {
}
// Overridden from aura::WindowObserver:
- virtual void OnWindowDestroyed(aura::Window* window) override;
+ void OnWindowDestroyed(aura::Window* window) override;
private:
// Invoked from destructor and OnWindowDestroyed() to cleanup.
« no previous file with comments | « ui/wm/core/base_focus_rules.h ('k') | ui/wm/core/compound_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698