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

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

Issue 350183002: Rename "managed (mode|user)" to "supervised user" (part 5) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 { "hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION }, 267 { "hotwordConfirmMessage", IDS_HOTWORD_SEARCH_PREF_DESCRIPTION },
268 { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE }, 268 { "hotwordAudioLoggingEnable", IDS_HOTWORD_AUDIO_LOGGING_ENABLE },
269 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON }, 269 { "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
270 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE }, 270 { "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
271 { "languageAndSpellCheckSettingsButton", 271 { "languageAndSpellCheckSettingsButton",
272 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS }, 272 IDS_OPTIONS_SETTINGS_LANGUAGE_AND_INPUT_SETTINGS },
273 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF }, 273 { "linkDoctorPref", IDS_OPTIONS_LINKDOCTOR_PREF },
274 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK }, 274 { "manageAutofillSettings", IDS_OPTIONS_MANAGE_AUTOFILL_SETTINGS_LINK },
275 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES }, 275 { "manageLanguages", IDS_OPTIONS_TRANSLATE_MANAGE_LANGUAGES },
276 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK }, 276 { "managePasswords", IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK },
277 { "managedUserLabel", IDS_MANAGED_USER_AVATAR_LABEL }, 277 { "managedUserLabel", IDS_SUPERVISED_USER_AVATAR_LABEL },
278 { "networkPredictionEnabledDescription", 278 { "networkPredictionEnabledDescription",
279 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION }, 279 IDS_NETWORK_PREDICTION_ENABLED_DESCRIPTION },
280 { "passwordsAndAutofillGroupName", 280 { "passwordsAndAutofillGroupName",
281 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME }, 281 IDS_OPTIONS_PASSWORDS_AND_FORMS_GROUP_NAME },
282 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE }, 282 { "passwordManagerEnabled", IDS_OPTIONS_PASSWORD_MANAGER_ENABLE },
283 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON }, 283 { "privacyClearDataButton", IDS_OPTIONS_PRIVACY_CLEAR_DATA_BUTTON },
284 { "privacyContentSettingsButton", 284 { "privacyContentSettingsButton",
285 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON }, 285 IDS_OPTIONS_PRIVACY_CONTENT_SETTINGS_BUTTON },
286 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL }, 286 { "profilesCreate", IDS_PROFILES_CREATE_BUTTON_LABEL },
287 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL }, 287 { "profilesDelete", IDS_PROFILES_DELETE_BUTTON_LABEL },
(...skipping 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
1798 extension = extensions::GetExtensionOverridingProxy( 1798 extension = extensions::GetExtensionOverridingProxy(
1799 Profile::FromWebUI(web_ui())); 1799 Profile::FromWebUI(web_ui()));
1800 AppendExtensionData("proxy", extension, &extension_controlled); 1800 AppendExtensionData("proxy", extension, &extension_controlled);
1801 1801
1802 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1802 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1803 extension_controlled); 1803 extension_controlled);
1804 #endif // defined(OS_WIN) 1804 #endif // defined(OS_WIN)
1805 } 1805 }
1806 1806
1807 } // namespace options 1807 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698