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

Side by Side Diff: ash/shelf/shelf_window_watcher.h

Issue 2185743002: Remove ash::ScopedObserverWithDuplicatedSources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_SHELF_SHELF_WINDOW_WATCHER_H_ 5 #ifndef ASH_SHELF_SHELF_WINDOW_WATCHER_H_
6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 6 #define ASH_SHELF_SHELF_WINDOW_WATCHER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 10 #include "base/macros.h"
13 #include "base/scoped_observer.h" 11 #include "base/scoped_observer.h"
14 #include "ui/aura/window_observer.h" 12 #include "ui/aura/window_observer.h"
15 #include "ui/display/display_observer.h" 13 #include "ui/display/display_observer.h"
16 #include "ui/wm/public/activation_change_observer.h" 14 #include "ui/wm/public/activation_change_observer.h"
17 15
18 namespace aura { 16 namespace aura {
19 17
20 class Window; 18 class Window;
21 19
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 130
133 // Holds all observed windows. 131 // Holds all observed windows.
134 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_; 132 ScopedObserver<aura::Window, aura::WindowObserver> observed_windows_;
135 133
136 // Holds all observed root windows. 134 // Holds all observed root windows.
137 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; 135 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_;
138 136
139 // Holds removed windows that has an item from default container. 137 // Holds removed windows that has an item from default container.
140 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_; 138 ScopedObserver<aura::Window, aura::WindowObserver> observed_removed_windows_;
141 139
142 // Holds all observed activation clients.
143 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
144 aura::client::ActivationChangeObserver>
145 observed_activation_clients_;
146
147 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); 140 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
148 }; 141 };
149 142
150 } // namespace ash 143 } // namespace ash
151 144
152 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 145 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698