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

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: fix2 Created 6 years, 5 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_restore_service.h" 8 #include "apps/app_restore_service.h"
9 #include "apps/app_window.h" 9 #include "apps/app_window.h"
10 #include "apps/app_window_registry.h" 10 #include "apps/app_window_registry.h"
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 source->AddString("extensionSettingsPermissions", 505 source->AddString("extensionSettingsPermissions",
506 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK)); 506 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK));
507 source->AddString("extensionSettingsVisitWebsite", 507 source->AddString("extensionSettingsVisitWebsite",
508 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE)); 508 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE));
509 source->AddString("extensionSettingsVisitWebStore", 509 source->AddString("extensionSettingsVisitWebStore",
510 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSTORE)); 510 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSTORE));
511 source->AddString("extensionSettingsPolicyControlled", 511 source->AddString("extensionSettingsPolicyControlled",
512 l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED)); 512 l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED));
513 source->AddString("extensionSettingsDependentExtensions", 513 source->AddString("extensionSettingsDependentExtensions",
514 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEPENDENT_EXTENSIONS)); 514 l10n_util::GetStringUTF16(IDS_EXTENSIONS_DEPENDENT_EXTENSIONS));
515 source->AddString("extensionSettingsManagedMode", 515 source->AddString("extensionSettingsSupervisedUser",
516 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_SUPERVISED_USER)); 516 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_SUPERVISED_USER));
517 source->AddString("extensionSettingsCorruptInstall", 517 source->AddString("extensionSettingsCorruptInstall",
518 l10n_util::GetStringUTF16( 518 l10n_util::GetStringUTF16(
519 IDS_EXTENSIONS_CORRUPTED_EXTENSION)); 519 IDS_EXTENSIONS_CORRUPTED_EXTENSION));
520 source->AddString("extensionSettingsSuspiciousInstall", 520 source->AddString("extensionSettingsSuspiciousInstall",
521 l10n_util::GetStringFUTF16( 521 l10n_util::GetStringFUTF16(
522 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE, 522 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE,
523 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE))); 523 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE)));
524 source->AddString("extensionSettingsLearnMore", 524 source->AddString("extensionSettingsLearnMore",
525 l10n_util::GetStringUTF16(IDS_LEARN_MORE)); 525 l10n_util::GetStringUTF16(IDS_LEARN_MORE));
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 empty_pages, // Terminated process has no active pages. 850 empty_pages, // Terminated process has no active pages.
851 warnings)); 851 warnings));
852 } 852 }
853 } 853 }
854 results.Set("extensions", extensions_list); 854 results.Set("extensions", extensions_list);
855 855
856 bool is_supervised = profile->IsSupervised(); 856 bool is_supervised = profile->IsSupervised();
857 bool developer_mode = 857 bool developer_mode =
858 !is_supervised && 858 !is_supervised &&
859 profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode); 859 profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
860 results.SetBoolean("profileIsManaged", is_supervised); 860 results.SetBoolean("profileIsSupervised", is_supervised);
861 results.SetBoolean("developerMode", developer_mode); 861 results.SetBoolean("developerMode", developer_mode);
862 862
863 // Promote the Chrome Apps & Extensions Developer Tools if they are not 863 // Promote the Chrome Apps & Extensions Developer Tools if they are not
864 // installed and the user has not previously dismissed the warning. 864 // installed and the user has not previously dismissed the warning.
865 bool promote_apps_dev_tools = false; 865 bool promote_apps_dev_tools = false;
866 if (!ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))-> 866 if (!ExtensionRegistry::Get(Profile::FromWebUI(web_ui()))->
867 GetExtensionById(kAppsDeveloperToolsExtensionId, 867 GetExtensionById(kAppsDeveloperToolsExtensionId,
868 ExtensionRegistry::EVERYTHING) && 868 ExtensionRegistry::EVERYTHING) &&
869 !profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDismissedADTPromo)) { 869 !profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDismissedADTPromo)) {
870 promote_apps_dev_tools = true; 870 promote_apps_dev_tools = true;
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1388 extension_service_->EnableExtension(extension_id); 1388 extension_service_->EnableExtension(extension_id);
1389 } else { 1389 } else {
1390 ExtensionErrorReporter::GetInstance()->ReportError( 1390 ExtensionErrorReporter::GetInstance()->ReportError(
1391 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')), 1391 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
1392 true); // Be noisy. 1392 true); // Be noisy.
1393 } 1393 }
1394 requirements_checker_.reset(); 1394 requirements_checker_.reset();
1395 } 1395 }
1396 1396
1397 } // namespace extensions 1397 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698