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

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

Issue 222143002: Mark supervised users in the "Users" list in about:settings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Aaand now without "display: flex"! Created 6 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 | Annotate | Revision Log
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/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 { "hotwordRetryDownloadButton", IDS_HOTWORD_RETRY_DOWNLOAD_BUTTON }, 261 { "hotwordRetryDownloadButton", IDS_HOTWORD_RETRY_DOWNLOAD_BUTTON },
262 { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE }, 262 { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE },
263 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON }, 263 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
264 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE }, 264 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
265 { "languageAndSpellCheckSettingsButton", 265 { "languageAndSpellCheckSettingsButton",
266 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS }, 266 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS },
267 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF }, 267 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
268 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK }, 268 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
269 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES }, 269 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES },
270 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, 270 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
271 { "managedUserLabel", IDS_MANAGED_USER_AVATAR_LABEL },
271 { "networkPredictionEnabledDescription", 272 { "networkPredictionEnabledDescription",
272 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 273 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
273 { "passwordsAndAutofillGroupName", 274 { "passwordsAndAutofillGroupName",
274 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, 275 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
275 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, 276 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
276 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 277 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
277 { "privacyContentSettingsButton", 278 { "privacyContentSettingsButton",
278 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 279 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
279 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, 280 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
280 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, 281 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
(...skipping 1540 matching lines...) Expand 10 before | Expand all | Expand 10 after
1821 void BrowserOptionsHandler::SetupEasyUnlock() { 1822 void BrowserOptionsHandler::SetupEasyUnlock() {
1822 bool has_pairing = !Profile::FromWebUI(web_ui())->GetPrefs() 1823 bool has_pairing = !Profile::FromWebUI(web_ui())->GetPrefs()
1823 ->GetDictionary(prefs::kEasyUnlockPairing)->empty(); 1824 ->GetDictionary(prefs::kEasyUnlockPairing)->empty();
1824 base::FundamentalValue has_pairing_value(has_pairing); 1825 base::FundamentalValue has_pairing_value(has_pairing);
1825 web_ui()->CallJavascriptFunction( 1826 web_ui()->CallJavascriptFunction(
1826 "BrowserOptions.updateEasyUnlock", 1827 "BrowserOptions.updateEasyUnlock",
1827 has_pairing_value); 1828 has_pairing_value);
1828 } 1829 }
1829 1830
1830 } // namespace options 1831 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698