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

Side by Side Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.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_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "ash/session/session_state_observer.h" 12 #include "ash/session/session_state_observer.h"
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/observer_list.h" 15 #include "base/observer_list.h"
16 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h" 16 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
17 #include "components/signin/core/account_id/account_id.h" 17 #include "components/signin/core/account_id/account_id.h"
18 #include "content/public/browser/notification_observer.h" 18 #include "content/public/browser/notification_observer.h"
19 #include "content/public/browser/notification_registrar.h" 19 #include "content/public/browser/notification_registrar.h"
20 #include "ui/aura/window_observer.h" 20 #include "ui/aura/window_observer.h"
21 #include "ui/wm/core/transient_window_observer.h" 21 #include "ui/wm/core/transient_window_observer.h"
22 22
23 class Browser; 23 class Browser;
24 class MultiUserNotificationBlockerChromeOS; 24 class MultiUserNotificationBlockerChromeOS;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 // A map which remembers for owned transient windows their own visibility. 236 // A map which remembers for owned transient windows their own visibility.
237 TransientWindowToVisibility transient_window_to_visibility_; 237 TransientWindowToVisibility transient_window_to_visibility_;
238 238
239 // The currently selected active user. It is used to find the proper 239 // The currently selected active user. It is used to find the proper
240 // visibility state in various cases. The state is stored here instead of 240 // visibility state in various cases. The state is stored here instead of
241 // being read from the user manager to be in sync while a switch occurs. 241 // being read from the user manager to be in sync while a switch occurs.
242 AccountId current_account_id_; 242 AccountId current_account_id_;
243 243
244 // The blocker which controls the desktop notification visibility based on the 244 // The blocker which controls the desktop notification visibility based on the
245 // current multi-user status. 245 // current multi-user status.
246 scoped_ptr<MultiUserNotificationBlockerChromeOS> notification_blocker_; 246 std::unique_ptr<MultiUserNotificationBlockerChromeOS> notification_blocker_;
247 247
248 // The notification registrar to track the creation of browser windows. 248 // The notification registrar to track the creation of browser windows.
249 content::NotificationRegistrar registrar_; 249 content::NotificationRegistrar registrar_;
250 250
251 // Suppress changes to the visibility flag while we are changing it ourselves. 251 // Suppress changes to the visibility flag while we are changing it ourselves.
252 bool suppress_visibility_changes_; 252 bool suppress_visibility_changes_;
253 253
254 // The speed which is used to perform any animations. 254 // The speed which is used to perform any animations.
255 AnimationSpeed animation_speed_; 255 AnimationSpeed animation_speed_;
256 256
257 // The animation between users. 257 // The animation between users.
258 scoped_ptr<UserSwitchAnimatorChromeOS> animation_; 258 std::unique_ptr<UserSwitchAnimatorChromeOS> animation_;
259 259
260 DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerChromeOS); 260 DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerChromeOS);
261 }; 261 };
262 262
263 } // namespace chrome 263 } // namespace chrome
264 264
265 #endif // CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H _ 265 #endif // CHROME_BROWSER_UI_ASH_MULTI_USER_MULTI_USER_WINDOW_MANAGER_CHROMEOS_H _
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698