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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 unified diff | Download patch
« no previous file with comments | « ash/shell/window_watcher.h ('k') | ash/shell/window_watcher_shelf_item_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "ash/shell/window_watcher.h" 5 #include "ash/shell/window_watcher.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/shelf/shelf.h" 8 #include "ash/shelf/shelf.h"
9 #include "ash/shelf/shelf_item_delegate_manager.h" 9 #include "ash/shelf/shelf_item_delegate_manager.h"
10 #include "ash/shelf/shelf_model.h" 10 #include "ash/shelf/shelf_model.h"
(...skipping 10 matching lines...) Expand all
21 namespace shell { 21 namespace shell {
22 22
23 class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver { 23 class WindowWatcher::WorkspaceWindowWatcher : public aura::WindowObserver {
24 public: 24 public:
25 explicit WorkspaceWindowWatcher(WindowWatcher* watcher) : watcher_(watcher) { 25 explicit WorkspaceWindowWatcher(WindowWatcher* watcher) : watcher_(watcher) {
26 } 26 }
27 27
28 virtual ~WorkspaceWindowWatcher() { 28 virtual ~WorkspaceWindowWatcher() {
29 } 29 }
30 30
31 virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE { 31 virtual void OnWindowAdded(aura::Window* new_window) override {
32 new_window->AddObserver(watcher_); 32 new_window->AddObserver(watcher_);
33 } 33 }
34 34
35 virtual void OnWillRemoveWindow(aura::Window* window) OVERRIDE { 35 virtual void OnWillRemoveWindow(aura::Window* window) override {
36 DCHECK(window->children().empty()); 36 DCHECK(window->children().empty());
37 window->RemoveObserver(watcher_); 37 window->RemoveObserver(watcher_);
38 } 38 }
39 39
40 void RootWindowAdded(aura::Window* root) { 40 void RootWindowAdded(aura::Window* root) {
41 aura::Window* panel_container = 41 aura::Window* panel_container =
42 ash::Shell::GetContainer(root, kShellWindowId_PanelContainer); 42 ash::Shell::GetContainer(root, kShellWindowId_PanelContainer);
43 panel_container->AddObserver(watcher_); 43 panel_container->AddObserver(watcher_);
44 44
45 aura::Window* container = 45 aura::Window* container =
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) { 146 void WindowWatcher::OnDisplayRemoved(const gfx::Display& old_display) {
147 // All windows in the display has already been removed, so no need to 147 // All windows in the display has already been removed, so no need to
148 // remove observers. 148 // remove observers.
149 } 149 }
150 150
151 void WindowWatcher::OnDisplayMetricsChanged(const gfx::Display&, uint32_t) { 151 void WindowWatcher::OnDisplayMetricsChanged(const gfx::Display&, uint32_t) {
152 } 152 }
153 153
154 } // namespace shell 154 } // namespace shell
155 } // namespace ash 155 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell/window_watcher.h ('k') | ash/shell/window_watcher_shelf_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698