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

Side by Side Diff: chrome/browser/ui/webui/options/supervised_user_import_handler.cc

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 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h" 5 #include "chrome/browser/ui/webui/options/supervised_user_import_handler.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 #include "chrome/common/url_constants.h" 27 #include "chrome/common/url_constants.h"
28 #include "chrome/grit/generated_resources.h" 28 #include "chrome/grit/generated_resources.h"
29 #include "components/prefs/pref_service.h" 29 #include "components/prefs/pref_service.h"
30 #include "components/signin/core/browser/signin_error_controller.h" 30 #include "components/signin/core/browser/signin_error_controller.h"
31 #include "components/signin/core/browser/signin_manager.h" 31 #include "components/signin/core/browser/signin_manager.h"
32 #include "content/public/browser/web_ui.h" 32 #include "content/public/browser/web_ui.h"
33 #include "grit/theme_resources.h" 33 #include "grit/theme_resources.h"
34 34
35 namespace { 35 namespace {
36 36
37 scoped_ptr<base::ListValue> GetAvatarIcons() { 37 std::unique_ptr<base::ListValue> GetAvatarIcons() {
38 scoped_ptr<base::ListValue> avatar_icons(new base::ListValue); 38 std::unique_ptr<base::ListValue> avatar_icons(new base::ListValue);
39 for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) { 39 for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) {
40 std::string avatar_url = profiles::GetDefaultAvatarIconUrl(i); 40 std::string avatar_url = profiles::GetDefaultAvatarIconUrl(i);
41 avatar_icons->Append(new base::StringValue(avatar_url)); 41 avatar_icons->Append(new base::StringValue(avatar_url));
42 } 42 }
43 43
44 return avatar_icons; 44 return avatar_icons;
45 } 45 }
46 46
47 bool ProfileIsLegacySupervised(const base::FilePath& profile_path) { 47 bool ProfileIsLegacySupervised(const base::FilePath& profile_path) {
48 ProfileAttributesEntry* entry; 48 ProfileAttributesEntry* entry;
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 const std::string& key) { 292 const std::string& key) {
293 if (key == supervised_users::kChromeAvatarIndex) 293 if (key == supervised_users::kChromeAvatarIndex)
294 FetchSupervisedUsers(); 294 FetchSupervisedUsers();
295 } 295 }
296 296
297 void SupervisedUserImportHandler::OnErrorChanged() { 297 void SupervisedUserImportHandler::OnErrorChanged() {
298 FetchSupervisedUsers(); 298 FetchSupervisedUsers();
299 } 299 }
300 300
301 } // namespace options 301 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/supervised_user_import_handler.h ('k') | chrome/browser/ui/webui/options/sync_setup_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698