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

Side by Side Diff: chrome/browser/ui/ash/launcher/browser_status_monitor.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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
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 CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ 6 #define CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 // Hold all observed activation clients. 141 // Hold all observed activation clients.
142 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient, 142 ScopedObserverWithDuplicatedSources<aura::client::ActivationClient,
143 aura::client::ActivationChangeObserver> observed_activation_clients_; 143 aura::client::ActivationChangeObserver> observed_activation_clients_;
144 144
145 // Hold all observed root windows. 145 // Hold all observed root windows.
146 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_; 146 ScopedObserver<aura::Window, aura::WindowObserver> observed_root_windows_;
147 147
148 BrowserToAppIDMap browser_to_app_id_map_; 148 BrowserToAppIDMap browser_to_app_id_map_;
149 WebContentsToObserverMap webcontents_to_observer_map_; 149 WebContentsToObserverMap webcontents_to_observer_map_;
150 scoped_ptr<SettingsWindowObserver> settings_window_observer_; 150 std::unique_ptr<SettingsWindowObserver> settings_window_observer_;
151 151
152 BrowserTabStripTracker browser_tab_strip_tracker_; 152 BrowserTabStripTracker browser_tab_strip_tracker_;
153 153
154 DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor); 154 DISALLOW_COPY_AND_ASSIGN(BrowserStatusMonitor);
155 }; 155 };
156 156
157 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_ 157 #endif // CHROME_BROWSER_UI_ASH_LAUNCHER_BROWSER_STATUS_MONITOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698