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

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

Issue 1550053002: Convert Pass()→std::move() in //chrome/browser/ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 10
(...skipping 22 matching lines...) Expand all
33 33
34 namespace { 34 namespace {
35 35
36 scoped_ptr<base::ListValue> GetAvatarIcons() { 36 scoped_ptr<base::ListValue> GetAvatarIcons() {
37 scoped_ptr<base::ListValue> avatar_icons(new base::ListValue); 37 scoped_ptr<base::ListValue> avatar_icons(new base::ListValue);
38 for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) { 38 for (size_t i = 0; i < profiles::GetDefaultAvatarIconCount(); ++i) {
39 std::string avatar_url = profiles::GetDefaultAvatarIconUrl(i); 39 std::string avatar_url = profiles::GetDefaultAvatarIconUrl(i);
40 avatar_icons->Append(new base::StringValue(avatar_url)); 40 avatar_icons->Append(new base::StringValue(avatar_url));
41 } 41 }
42 42
43 return avatar_icons.Pass(); 43 return avatar_icons;
44 } 44 }
45 45
46 bool ProfileIsLegacySupervised(const base::FilePath& profile_path) { 46 bool ProfileIsLegacySupervised(const base::FilePath& profile_path) {
47 const ProfileInfoCache& cache = 47 const ProfileInfoCache& cache =
48 g_browser_process->profile_manager()->GetProfileInfoCache(); 48 g_browser_process->profile_manager()->GetProfileInfoCache();
49 size_t index = cache.GetIndexOfProfileWithPath(profile_path); 49 size_t index = cache.GetIndexOfProfileWithPath(profile_path);
50 if (index == std::string::npos) 50 if (index == std::string::npos)
51 return false; 51 return false;
52 return cache.ProfileIsLegacySupervisedAtIndex(index); 52 return cache.ProfileIsLegacySupervisedAtIndex(index);
53 } 53 }
(...skipping 238 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

Powered by Google App Engine
This is Rietveld 408576698