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

Side by Side Diff: athena/wm/window_list_provider_impl.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « athena/wm/title_drag_controller.h ('k') | athena/wm/window_list_provider_impl_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 ATHENA_WM_WINDOW_LIST_PROVIDER_IMPL_H_ 5 #ifndef ATHENA_WM_WINDOW_LIST_PROVIDER_IMPL_H_
6 #define ATHENA_WM_WINDOW_LIST_PROVIDER_IMPL_H_ 6 #define ATHENA_WM_WINDOW_LIST_PROVIDER_IMPL_H_
7 7
8 #include "athena/wm/public/window_list_provider.h" 8 #include "athena/wm/public/window_list_provider.h"
9 #include "ui/aura/window_observer.h" 9 #include "ui/aura/window_observer.h"
10 10
11 namespace athena { 11 namespace athena {
12 12
13 class WindowListProviderObserver; 13 class WindowListProviderObserver;
14 14
15 // This implementation of the WindowListProviderImpl uses the same order as in 15 // This implementation of the WindowListProviderImpl uses the same order as in
16 // the container window's stacking order. 16 // the container window's stacking order.
17 class ATHENA_EXPORT WindowListProviderImpl : public WindowListProvider, 17 class ATHENA_EXPORT WindowListProviderImpl : public WindowListProvider,
18 public aura::WindowObserver { 18 public aura::WindowObserver {
19 public: 19 public:
20 explicit WindowListProviderImpl(aura::Window* container); 20 explicit WindowListProviderImpl(aura::Window* container);
21 virtual ~WindowListProviderImpl(); 21 virtual ~WindowListProviderImpl();
22 22
23 private: 23 private:
24 void RecreateWindowList(); 24 void RecreateWindowList();
25 25
26 // WindowListProvider: 26 // WindowListProvider:
27 virtual void AddObserver(WindowListProviderObserver* observer) OVERRIDE; 27 virtual void AddObserver(WindowListProviderObserver* observer) override;
28 virtual void RemoveObserver(WindowListProviderObserver* observer) OVERRIDE; 28 virtual void RemoveObserver(WindowListProviderObserver* observer) override;
29 virtual const aura::Window::Windows& GetWindowList() const OVERRIDE; 29 virtual const aura::Window::Windows& GetWindowList() const override;
30 virtual bool IsWindowInList(aura::Window* window) const OVERRIDE; 30 virtual bool IsWindowInList(aura::Window* window) const override;
31 virtual bool IsValidWindow(aura::Window* window) const OVERRIDE; 31 virtual bool IsValidWindow(aura::Window* window) const override;
32 virtual void StackWindowFrontOf(aura::Window* window, 32 virtual void StackWindowFrontOf(aura::Window* window,
33 aura::Window*reference_window) OVERRIDE; 33 aura::Window*reference_window) override;
34 virtual void StackWindowBehindTo(aura::Window* window, 34 virtual void StackWindowBehindTo(aura::Window* window,
35 aura::Window*reference_window) OVERRIDE; 35 aura::Window*reference_window) override;
36 36
37 // aura::WindowObserver: 37 // aura::WindowObserver:
38 virtual void OnWindowAdded(aura::Window* new_window) OVERRIDE; 38 virtual void OnWindowAdded(aura::Window* new_window) override;
39 virtual void OnWillRemoveWindow(aura::Window* old_window) OVERRIDE; 39 virtual void OnWillRemoveWindow(aura::Window* old_window) override;
40 virtual void OnWindowStackingChanged(aura::Window* window) OVERRIDE; 40 virtual void OnWindowStackingChanged(aura::Window* window) override;
41 41
42 aura::Window* container_; 42 aura::Window* container_;
43 aura::Window::Windows window_list_; 43 aura::Window::Windows window_list_;
44 ObserverList<WindowListProviderObserver> observers_; 44 ObserverList<WindowListProviderObserver> observers_;
45 45
46 DISALLOW_COPY_AND_ASSIGN(WindowListProviderImpl); 46 DISALLOW_COPY_AND_ASSIGN(WindowListProviderImpl);
47 }; 47 };
48 48
49 } // namespace athena 49 } // namespace athena
50 50
51 #endif // ATHENA_WM_WINDOW_LIST_PROVIDER_IMPL_H_ 51 #endif // ATHENA_WM_WINDOW_LIST_PROVIDER_IMPL_H_
OLDNEW
« no previous file with comments | « athena/wm/title_drag_controller.h ('k') | athena/wm/window_list_provider_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698