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

Side by Side Diff: ash/test/test_session_state_delegate.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/test/test_keyboard_ui.h ('k') | ash/test/test_shelf_delegate.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_TEST_TEST_SESSION_STATE_DELEGATE_H_ 5 #ifndef ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
6 #define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ 6 #define ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "ash/session/session_state_delegate.h" 11 #include "ash/session/session_state_delegate.h"
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/macros.h" 13 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "ui/gfx/image/image_skia.h" 14 #include "ui/gfx/image/image_skia.h"
15 15
16 class AccountId; 16 class AccountId;
17 17
18 namespace ash { 18 namespace ash {
19 namespace test { 19 namespace test {
20 20
21 class MockUserInfo; 21 class MockUserInfo;
22 22
23 class TestSessionStateDelegate : public SessionStateDelegate { 23 class TestSessionStateDelegate : public SessionStateDelegate {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 100
101 // The number of users logged in. 101 // The number of users logged in.
102 int logged_in_users_; 102 int logged_in_users_;
103 103
104 // The index for the activated user. 104 // The index for the activated user.
105 int active_user_index_; 105 int active_user_index_;
106 106
107 std::vector<MockUserInfo*> user_list_; 107 std::vector<MockUserInfo*> user_list_;
108 108
109 // The user manager to be used instead of the system instance. 109 // The user manager to be used instead of the system instance.
110 scoped_ptr<TestUserManager> user_manager_; 110 std::unique_ptr<TestUserManager> user_manager_;
111 111
112 // The current state of the login screen. |session_state_| becomes active 112 // The current state of the login screen. |session_state_| becomes active
113 // before the profile and browser UI are available. 113 // before the profile and browser UI are available.
114 SessionState session_state_; 114 SessionState session_state_;
115 115
116 DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate); 116 DISALLOW_COPY_AND_ASSIGN(TestSessionStateDelegate);
117 }; 117 };
118 118
119 } // namespace test 119 } // namespace test
120 } // namespace ash 120 } // namespace ash
121 121
122 #endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_ 122 #endif // ASH_TEST_TEST_SESSION_STATE_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/test/test_keyboard_ui.h ('k') | ash/test/test_shelf_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698