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

Side by Side Diff: chrome/browser/chromeos/profiles/profile_helper.h

Issue 1870793002: Convert //chrome/browser/chromeos 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 (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 CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
6 #define CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_ 6 #define CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
12 #include "base/files/file_path.h" 13 #include "base/files/file_path.h"
13 #include "base/macros.h" 14 #include "base/macros.h"
14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "chrome/browser/browsing_data/browsing_data_remover.h" 16 #include "chrome/browser/browsing_data/browsing_data_remover.h"
17 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" 17 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
18 #include "components/user_manager/user_manager.h" 18 #include "components/user_manager/user_manager.h"
19 19
20 class Profile; 20 class Profile;
21 21
22 namespace base { 22 namespace base {
23 class FilePath; 23 class FilePath;
24 } 24 }
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 208
209 // If true testing code path is used in GetUserByProfile() even if 209 // If true testing code path is used in GetUserByProfile() even if
210 // user_list_for_testing_ list is empty. In that case primary user will always 210 // user_list_for_testing_ list is empty. In that case primary user will always
211 // be returned. 211 // be returned.
212 static bool enable_profile_to_user_testing; 212 static bool enable_profile_to_user_testing;
213 213
214 // If true and enable_profile_to_user_testing is true then primary user will 214 // If true and enable_profile_to_user_testing is true then primary user will
215 // always be returned by GetUserByProfile(). 215 // always be returned by GetUserByProfile().
216 static bool always_return_primary_user_for_testing; 216 static bool always_return_primary_user_for_testing;
217 217
218 scoped_ptr<FileFlusher> profile_flusher_; 218 std::unique_ptr<FileFlusher> profile_flusher_;
219 219
220 base::WeakPtrFactory<ProfileHelper> weak_factory_; 220 base::WeakPtrFactory<ProfileHelper> weak_factory_;
221 221
222 DISALLOW_COPY_AND_ASSIGN(ProfileHelper); 222 DISALLOW_COPY_AND_ASSIGN(ProfileHelper);
223 }; 223 };
224 224
225 } // namespace chromeos 225 } // namespace chromeos
226 226
227 #endif // CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_ 227 #endif // CHROME_BROWSER_CHROMEOS_PROFILES_PROFILE_HELPER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698