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

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

Issue 228553002: Preference dis/allowing supervised users creation is now available as owner setting, not only as de… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Unnecessary callback removed. Patch applied for failing tests. Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/accounts_options_handler.h" 5 #include "chrome/browser/ui/webui/options/chromeos/accounts_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 void AccountsOptionsHandler::GetLocalizedValues( 64 void AccountsOptionsHandler::GetLocalizedValues(
65 base::DictionaryValue* localized_strings) { 65 base::DictionaryValue* localized_strings) {
66 DCHECK(localized_strings); 66 DCHECK(localized_strings);
67 67
68 RegisterTitle(localized_strings, "accountsPage", 68 RegisterTitle(localized_strings, "accountsPage",
69 IDS_OPTIONS_ACCOUNTS_TAB_LABEL); 69 IDS_OPTIONS_ACCOUNTS_TAB_LABEL);
70 70
71 localized_strings->SetString("allow_BWSI", l10n_util::GetStringUTF16( 71 localized_strings->SetString("allow_BWSI", l10n_util::GetStringUTF16(
72 IDS_OPTIONS_ACCOUNTS_ALLOW_BWSI_DESCRIPTION)); 72 IDS_OPTIONS_ACCOUNTS_ALLOW_BWSI_DESCRIPTION));
73 localized_strings->SetString(
74 "allow_supervised_users",
75 l10n_util::GetStringUTF16(IDS_OPTIONS_ACCOUNTS_ENABLE_SUPERVISED_USERS));
73 localized_strings->SetString("use_whitelist", l10n_util::GetStringUTF16( 76 localized_strings->SetString("use_whitelist", l10n_util::GetStringUTF16(
74 IDS_OPTIONS_ACCOUNTS_USE_WHITELIST_DESCRIPTION)); 77 IDS_OPTIONS_ACCOUNTS_USE_WHITELIST_DESCRIPTION));
75 localized_strings->SetString("show_user_on_signin", l10n_util::GetStringUTF16( 78 localized_strings->SetString("show_user_on_signin", l10n_util::GetStringUTF16(
76 IDS_OPTIONS_ACCOUNTS_SHOW_USER_NAMES_ON_SINGIN_DESCRIPTION)); 79 IDS_OPTIONS_ACCOUNTS_SHOW_USER_NAMES_ON_SINGIN_DESCRIPTION));
77 localized_strings->SetString("username_edit_hint", l10n_util::GetStringUTF16( 80 localized_strings->SetString("username_edit_hint", l10n_util::GetStringUTF16(
78 IDS_OPTIONS_ACCOUNTS_USERNAME_EDIT_HINT)); 81 IDS_OPTIONS_ACCOUNTS_USERNAME_EDIT_HINT));
79 localized_strings->SetString("username_format", l10n_util::GetStringUTF16( 82 localized_strings->SetString("username_format", l10n_util::GetStringUTF16(
80 IDS_OPTIONS_ACCOUNTS_USERNAME_FORMAT)); 83 IDS_OPTIONS_ACCOUNTS_USERNAME_FORMAT));
81 localized_strings->SetString("add_users", l10n_util::GetStringUTF16( 84 localized_strings->SetString("add_users", l10n_util::GetStringUTF16(
82 IDS_OPTIONS_ACCOUNTS_ADD_USERS)); 85 IDS_OPTIONS_ACCOUNTS_ADD_USERS));
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 136
134 const UserList& users = UserManager::Get()->GetUsers(); 137 const UserList& users = UserManager::Get()->GetUsers();
135 for (UserList::const_iterator it = users.begin(); it < users.end(); ++it) 138 for (UserList::const_iterator it = users.begin(); it < users.end(); ++it)
136 new_list->AppendIfNotPresent(new base::StringValue((*it)->email())); 139 new_list->AppendIfNotPresent(new base::StringValue((*it)->email()));
137 140
138 cros_settings->Set(kAccountsPrefUsers, *new_list.get()); 141 cros_settings->Set(kAccountsPrefUsers, *new_list.get());
139 } 142 }
140 143
141 } // namespace options 144 } // namespace options
142 } // namespace chromeos 145 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/accounts_options_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698