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

Side by Side Diff: chrome/browser/ui/ash/multi_user/user_switch_animator_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 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 CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory>
9 #include <string> 10 #include <string>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "components/signin/core/account_id/account_id.h" 14 #include "components/signin/core/account_id/account_id.h"
15 #include "ui/aura/window.h" 15 #include "ui/aura/window.h"
16 16
17 namespace chrome { 17 namespace chrome {
18 18
19 class MultiUserWindowManagerChromeOS; 19 class MultiUserWindowManagerChromeOS;
20 20
21 // A class which performs transitions animations between users. Upon creation, 21 // A class which performs transitions animations between users. Upon creation,
22 // the animation gets started and upon destruction the animation gets finished 22 // the animation gets started and upon destruction the animation gets finished
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 109
110 // The screen cover status before the animation has started. 110 // The screen cover status before the animation has started.
111 TransitioningScreenCover screen_cover_; 111 TransitioningScreenCover screen_cover_;
112 112
113 // Mapping users IDs to the list of windows to show for these users. 113 // Mapping users IDs to the list of windows to show for these users.
114 typedef std::map<AccountId, aura::Window::Windows> UserToWindowsMap; 114 typedef std::map<AccountId, aura::Window::Windows> UserToWindowsMap;
115 UserToWindowsMap windows_by_account_id_; 115 UserToWindowsMap windows_by_account_id_;
116 116
117 // A timer which watches to executes the second part of a "user changed" 117 // A timer which watches to executes the second part of a "user changed"
118 // animation. Note that this timer exists only during such an animation. 118 // animation. Note that this timer exists only during such an animation.
119 scoped_ptr<base::Timer> user_changed_animation_timer_; 119 std::unique_ptr<base::Timer> user_changed_animation_timer_;
120 120
121 // For unit tests: Check which wallpaper was set. 121 // For unit tests: Check which wallpaper was set.
122 std::string wallpaper_user_id_for_test_; 122 std::string wallpaper_user_id_for_test_;
123 123
124 DISALLOW_COPY_AND_ASSIGN(UserSwitchAnimatorChromeOS); 124 DISALLOW_COPY_AND_ASSIGN(UserSwitchAnimatorChromeOS);
125 }; 125 };
126 126
127 } // namespace chrome 127 } // namespace chrome
128 128
129 #endif // CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_ 129 #endif // CHROME_BROWSER_UI_ASH_MULTI_USER_USER_SWITCH_ANIMATOR_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698