chrome/browser/ui/webui/extensions/extension_settings_handler.cc - Issue 350183002: Rename "managed (mode|user)" to "supervised user" (part 5)

Side by Side Diff: chrome/browser/ui/webui/extensions/extension_settings_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

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc ('k') | chrome/browser/ui/webui/options/browser_options_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 470 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
481 l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK));	481 l10n_util::GetStringUTF16(IDS_EXTENSIONS_OPTIONS_LINK));

482 source->AddString("extensionSettingsPermissions",	482 source->AddString("extensionSettingsPermissions",

483 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK));	483 l10n_util::GetStringUTF16(IDS_EXTENSIONS_PERMISSIONS_LINK));

484 source->AddString("extensionSettingsVisitWebsite",	484 source->AddString("extensionSettingsVisitWebsite",

485 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE));	485 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSITE));

486 source->AddString("extensionSettingsVisitWebStore",	486 source->AddString("extensionSettingsVisitWebStore",

487 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSTORE));	487 l10n_util::GetStringUTF16(IDS_EXTENSIONS_VISIT_WEBSTORE));

488 source->AddString("extensionSettingsPolicyControlled",	488 source->AddString("extensionSettingsPolicyControlled",

489 l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED));	489 l10n_util::GetStringUTF16(IDS_EXTENSIONS_POLICY_CONTROLLED));

490 source->AddString("extensionSettingsManagedMode",	490 source->AddString("extensionSettingsManagedMode",

491 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_MANAGED_USER));	491 l10n_util::GetStringUTF16(IDS_EXTENSIONS_LOCKED_SUPERVISED_USER));

492 source->AddString("extensionSettingsCorruptInstall",	492 source->AddString("extensionSettingsCorruptInstall",

493 l10n_util::GetStringUTF16(	493 l10n_util::GetStringUTF16(

494 IDS_EXTENSIONS_CORRUPTED_EXTENSION));	494 IDS_EXTENSIONS_CORRUPTED_EXTENSION));

495 source->AddString("extensionSettingsSuspiciousInstall",	495 source->AddString("extensionSettingsSuspiciousInstall",

496 l10n_util::GetStringFUTF16(	496 l10n_util::GetStringFUTF16(

497 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE,	497 IDS_EXTENSIONS_ADDED_WITHOUT_KNOWLEDGE,

498 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE)));	498 l10n_util::GetStringUTF16(IDS_EXTENSION_WEB_STORE_TITLE)));

499 source->AddString("extensionSettingsLearnMore",	499 source->AddString("extensionSettingsLearnMore",

500 l10n_util::GetStringUTF16(IDS_LEARN_MORE));	500 l10n_util::GetStringUTF16(IDS_LEARN_MORE));

501 source->AddString("extensionSettingsCorruptInstallHelpUrl",	501 source->AddString("extensionSettingsCorruptInstallHelpUrl",

(...skipping 843 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1345 extension_service_->EnableExtension(extension_id);	1345 extension_service_->EnableExtension(extension_id);

1346 } else {	1346 } else {

1347 ExtensionErrorReporter::GetInstance()->ReportError(	1347 ExtensionErrorReporter::GetInstance()->ReportError(

1348 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),	1348 base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),

1349 true); // Be noisy.	1349 true); // Be noisy.

1350 }	1350 }

1351 requirements_checker_.reset();	1351 requirements_checker_.reset();

1352 }	1352 }

1353	1353

1354 } // namespace extensions	1354 } // namespace extensions

OLD	NEW