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

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 403343002: Rename "managed (mode|user)" to "supervised user" (part 8) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 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/extensions/extension_settings_handler.h" 5 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
6 6
7 #include "apps/app_load_service.h" 7 #include "apps/app_load_service.h"
8 #include "apps/app_window.h" 8 #include "apps/app_window.h"
9 #include "apps/app_window_registry.h" 9 #include "apps/app_window_registry.h"
10 #include "apps/saved_files_service.h" 10 #include "apps/saved_files_service.h"
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 source->AddString("extensionSettingsPermissions", 507 source->AddString("extensionSettingsPermissions",
508 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK)); 508 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK));
509 source->AddString("extensionSettingsVisitWebsite", 509 source->AddString("extensionSettingsVisitWebsite",
510 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE)); 510 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE));
511 source->AddString("extensionSettingsVisitWebStore", 511 source->AddString("extensionSettingsVisitWebStore",
512 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSTORE)); 512 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSTORE));
513 source->AddString("extensionSettingsPolicyControlled", 513 source->AddString("extensionSettingsPolicyControlled",
514 l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED)); 514 l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED));
515 source->AddString("extensionSettingsDependentExtensions", 515 source->AddString("extensionSettingsDependentExtensions",
516 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEPENDENT_EXTENSIONS)); 516 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEPENDENT_EXTENSIONS));
517 source->AddString("extensionSettingsManagedMode", 517 source->AddString("extensionSettingsSupervisedUser",
518 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_SUPERVISED_USER)); 518 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_SUPERVISED_USER));
519 source->AddString("extensionSettingsCorruptInstall", 519 source->AddString("extensionSettingsCorruptInstall",
520 l10n_util::GetStringUTF16( 520 l10n_util::GetStringUTF16(
521 IDS_EXTENSIONS_CORRUPTED_EXTENSION)); 521 IDS_EXTENSIONS_CORRUPTED_EXTENSION));
522 source->AddString("extensionSettingsSuspiciousInstall", 522 source->AddString("extensionSettingsSuspiciousInstall",
523 l10n_util::GetStringFUTF16( 523 l10n_util::GetStringFUTF16(
524 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE, 524 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE,
525 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE))); 525 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE)));
526 source->AddString("extensionSettingsLearnMore", 526 source->AddString("extensionSettingsLearnMore",
527 l10n_util::GetStringUTF16(IDS_LEARN_MORE)); 527 l10n_util::GetStringUTF16(IDS_LEARN_MORE));
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 } 852 }
853 results.Set("extensions", extensions_list); 853 results.Set("extensions", extensions_list);
854 854
855 bool is_supervised = profile->IsSupervised(); 855 bool is_supervised = profile->IsSupervised();
856 bool incognito_available = 856 bool incognito_available =
857 IncognitoModePrefs::GetAvailability(profile->GetPrefs()) != 857 IncognitoModePrefs::GetAvailability(profile->GetPrefs()) !=
858 IncognitoModePrefs::DISABLED; 858 IncognitoModePrefs::DISABLED;
859 bool developer_mode = 859 bool developer_mode =
860 !is_supervised && 860 !is_supervised &&
861 profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode); 861 profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
862 results.SetBoolean("profileIsManaged", is_supervised); 862 results.SetBoolean("profileIsSupervised", is_supervised);
863 results.SetBoolean("incognitoAvailable", incognito_available); 863 results.SetBoolean("incognitoAvailable", incognito_available);
864 results.SetBoolean("developerMode", developer_mode); 864 results.SetBoolean("developerMode", developer_mode);
865 865
866 // Promote the Chrome Apps & Extensions Developer Tools if they are not 866 // Promote the Chrome Apps & Extensions Developer Tools if they are not
867 // installed and the user has not previously dismissed the warning. 867 // installed and the user has not previously dismissed the warning.
868 bool promote_apps_dev_tools = false; 868 bool promote_apps_dev_tools = false;
869 if (!ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))-> 869 if (!ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->
870 GetExtensionById(kAppsDeveloperToolsExtensionId, 870 GetExtensionById(kAppsDeveloperToolsExtensionId,
871 ExtensionRegistry::EVERYTHING) && 871 ExtensionRegistry::EVERYTHING) &&
872 !profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDismissedADTPromo)) { 872 !profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDismissedADTPromo)) {
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 extension_service_->EnableExtension(extension_id); 1392 extension_service_->EnableExtension(extension_id);
1393 } else { 1393 } else {
1394 ExtensionErrorReporter::GetInstance()->ReportError( 1394 ExtensionErrorReporter::GetInstance()->ReportError(
1395 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1395 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1396 true); // Be noisy. 1396 true); // Be noisy.
1397 } 1397 }
1398 requirements_checker_.reset(); 1398 requirements_checker_.reset();
1399 } 1399 }
1400 1400
1401 } // namespace extensions 1401 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/chromeos/ui_account_tweaks.cc ('k') | chrome/browser/ui/webui/history_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698