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

Side by Side Diff: ash/shell/window_watcher.h

Issue 679283002: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELL_WINDOW_WATCHER_H_ 5 #ifndef ASH_SHELL_WINDOW_WATCHER_H_
6 #define ASH_SHELL_WINDOW_WATCHER_H_ 6 #define ASH_SHELL_WINDOW_WATCHER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "ash/shelf/shelf_item_types.h" 10 #include "ash/shelf/shelf_item_types.h"
(...skipping 11 matching lines...) Expand all
22 namespace shell { 22 namespace shell {
23 23
24 // TODO(sky): fix this class, its a bit broke with workspace2. 24 // TODO(sky): fix this class, its a bit broke with workspace2.
25 25
26 // WindowWatcher is responsible for listening for newly created windows and 26 // WindowWatcher is responsible for listening for newly created windows and
27 // creating items on the Shelf for them. 27 // creating items on the Shelf for them.
28 class WindowWatcher : public aura::WindowObserver, 28 class WindowWatcher : public aura::WindowObserver,
29 public gfx::DisplayObserver { 29 public gfx::DisplayObserver {
30 public: 30 public:
31 WindowWatcher(); 31 WindowWatcher();
32 virtual ~WindowWatcher(); 32 ~WindowWatcher() override;
33 33
34 aura::Window* GetWindowByID(ash::ShelfID id); 34 aura::Window* GetWindowByID(ash::ShelfID id);
35 35
36 // aura::WindowObserver overrides: 36 // aura::WindowObserver overrides:
37 virtual void OnWindowAdded(aura::Window* new_window) override; 37 void OnWindowAdded(aura::Window* new_window) override;
38 virtual void OnWillRemoveWindow(aura::Window* window) override; 38 void OnWillRemoveWindow(aura::Window* window) override;
39 39
40 // gfx::DisplayObserver overrides: 40 // gfx::DisplayObserver overrides:
41 virtual void OnDisplayAdded(const gfx::Display& new_display) override; 41 void OnDisplayAdded(const gfx::Display& new_display) override;
42 virtual void OnDisplayRemoved(const gfx::Display& old_display) override; 42 void OnDisplayRemoved(const gfx::Display& old_display) override;
43 virtual void OnDisplayMetricsChanged(const gfx::Display& display, 43 void OnDisplayMetricsChanged(const gfx::Display& display,
44 uint32_t metrics) override; 44 uint32_t metrics) override;
45 45
46 private: 46 private:
47 class WorkspaceWindowWatcher; 47 class WorkspaceWindowWatcher;
48 48
49 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow; 49 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow;
50 50
51 // Maps from window to the id we gave it. 51 // Maps from window to the id we gave it.
52 IDToWindow id_to_window_; 52 IDToWindow id_to_window_;
53 53
54 scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_; 54 scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_;
55 55
56 DISALLOW_COPY_AND_ASSIGN(WindowWatcher); 56 DISALLOW_COPY_AND_ASSIGN(WindowWatcher);
57 }; 57 };
58 58
59 } // namespace shell 59 } // namespace shell
60 } // namespace ash 60 } // namespace ash
61 61
62 #endif // ASH_SHELL_WINDOW_WATCHER_H_ 62 #endif // ASH_SHELL_WINDOW_WATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698