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

Unified Diff: ash/shelf/shelf_window_watcher.h

Issue 684643002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 | « ash/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_window_watcher_item_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_window_watcher.h
diff --git a/ash/shelf/shelf_window_watcher.h b/ash/shelf/shelf_window_watcher.h
index 4a9cd04a2796b0a34e857aa5a16c1e28a453af42..28c9b22c7c4b2d7148e594b85863b82d33a087b8 100644
--- a/ash/shelf/shelf_window_watcher.h
+++ b/ash/shelf/shelf_window_watcher.h
@@ -37,17 +37,17 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
public:
ShelfWindowWatcher(ShelfModel* model,
ShelfItemDelegateManager* item_delegate_manager);
- virtual ~ShelfWindowWatcher();
+ ~ShelfWindowWatcher() override;
private:
class RootWindowObserver : public aura::WindowObserver {
public:
explicit RootWindowObserver(ShelfWindowWatcher* window_watcher);
- virtual ~RootWindowObserver();
+ ~RootWindowObserver() override;
private:
// aura::WindowObserver overrides:
- virtual void OnWindowDestroying(aura::Window* window) override;
+ void OnWindowDestroying(aura::Window* window) override;
// Owned by Shell.
ShelfWindowWatcher* window_watcher_;
@@ -60,13 +60,13 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
class RemovedWindowObserver : public aura::WindowObserver {
public:
explicit RemovedWindowObserver(ShelfWindowWatcher* window_watcher);
- virtual ~RemovedWindowObserver();
+ ~RemovedWindowObserver() override;
private:
// aura::WindowObserver overrides:
- virtual void OnWindowParentChanged(aura::Window* window,
- aura::Window* parent) override;
- virtual void OnWindowDestroyed(aura::Window* window) override;
+ void OnWindowParentChanged(aura::Window* window,
+ aura::Window* parent) override;
+ void OnWindowDestroyed(aura::Window* window) override;
// Owned by Shell.
ShelfWindowWatcher* window_watcher_;
@@ -103,22 +103,22 @@ class ShelfWindowWatcher : public aura::client::ActivationChangeObserver,
void FinishObservingRemovedWindow(aura::Window* window);
// aura::client::ActivationChangeObserver overrides:
- virtual void OnWindowActivated(aura::Window* gained_active,
- aura::Window* lost_active) override;
+ void OnWindowActivated(aura::Window* gained_active,
+ aura::Window* lost_active) override;
// aura::WindowObserver overrides:
- virtual void OnWindowAdded(aura::Window* window) override;
- virtual void OnWillRemoveWindow(aura::Window* window) override;
- virtual void OnWindowDestroying(aura::Window* window) override;
- virtual void OnWindowPropertyChanged(aura::Window* window,
- const void* key,
- intptr_t old) override;
+ void OnWindowAdded(aura::Window* window) override;
+ void OnWillRemoveWindow(aura::Window* window) override;
+ void OnWindowDestroying(aura::Window* window) override;
+ void OnWindowPropertyChanged(aura::Window* window,
+ const void* key,
+ intptr_t old) override;
// gfx::DisplayObserver overrides:
- virtual void OnDisplayAdded(const gfx::Display& display) override;
- virtual void OnDisplayRemoved(const gfx::Display& old_display) override;
- virtual void OnDisplayMetricsChanged(const gfx::Display& display,
- uint32_t metrics) override;
+ void OnDisplayAdded(const gfx::Display& display) override;
+ void OnDisplayRemoved(const gfx::Display& old_display) override;
+ void OnDisplayMetricsChanged(const gfx::Display& display,
+ uint32_t metrics) override;
// Owned by Shell.
ShelfModel* model_;
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_window_watcher_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698