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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_window_watcher.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 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" 10 #include "ash/shelf/scoped_observer_with_duplicated_sources.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "base/scoped_observer.h" 13 #include "base/scoped_observer.h"
15 #include "ui/aura/window_observer.h" 14 #include "ui/aura/window_observer.h"
16 #include "ui/gfx/display_observer.h" 15 #include "ui/gfx/display_observer.h"
17 #include "ui/wm/public/activation_change_observer.h" 16 #include "ui/wm/public/activation_change_observer.h"
18 17
19 namespace aura { 18 namespace aura {
20 19
21 class Window; 20 class Window;
22 21
23 namespace client { 22 namespace client {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 // Holds all observed activation clients. 143 // Holds all observed activation clients.
145 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient, 144 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
146 aura::client::ActivationChangeObserver> observed_activation_clients_; 145 aura::client::ActivationChangeObserver> observed_activation_clients_;
147 146
148 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); 147 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
149 }; 148 };
150 149
151 } // namespace ash 150 } // namespace ash
152 151
153 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_ 152 #endif // ASH_SHELF_SHELF_WINDOW_WATCHER_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget.cc ('k') | ash/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698