Skip to content

Commit

Permalink
Annotating the extension if installed via enterprise policy.
Browse files Browse the repository at this point in the history
BUG=247028
R=asargent@chromium.org, jhawkins@chromium.org

Review URL: https://codereview.chromium.org/16123032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205583 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
finnur@chromium.org committed Jun 11, 2013
1 parent 1cb35a7 commit e040c24
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 3 additions & 0 deletions chrome/app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -10957,6 +10957,9 @@ Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Pr
<message name="IDS_OPTIONS_INSTALL_LOCATION_3RD_PARTY" desc="The text explaining the the installation came from a 3rd party app.">
Installed by a third party.
</message>
<message name="IDS_OPTIONS_INSTALL_LOCATION_ENTERPRISE" desc="The text explaining the the installation of the extension came from an enterprise policy.">
Installed by enterprise policy.
</message>

<!-- Options search page strings. -->
<message name="IDS_OPTIONS_SEARCH_PAGE_TITLE" desc="Title of the settings search page.">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,10 @@ DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(
extensions::ManifestURL::GetHomepageURL(extension).is_valid());

string16 location_text;
if (extension->location() == Manifest::INTERNAL &&
if (extension->location() == Manifest::EXTERNAL_POLICY_DOWNLOAD) {
location_text = l10n_util::GetStringUTF16(
IDS_OPTIONS_INSTALL_LOCATION_ENTERPRISE);
} else if (extension->location() == Manifest::INTERNAL &&
!extensions::ManifestURL::UpdatesFromGallery(extension)) {
location_text = l10n_util::GetStringUTF16(
IDS_OPTIONS_INSTALL_LOCATION_UNKNOWN);
Expand Down

0 comments on commit e040c24

Please sign in to comment.