chrome/browser/ui/webui/extensions/extension_settings_handler.cc - Issue 24365004: Add EXTERNAL_POLICY to list of possible extension locations

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

Issue 24365004: Add EXTERNAL_POLICY to list of possible extension locations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 3 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:

Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc

diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

index d9fffda9a0f4b3723e519f17af270d56cb0e11e2..90e774128291e40fd9ee4a0641b7c2a88d39deaf 100644

--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc

@@ -192,7 +192,8 @@ base::DictionaryValue* ExtensionSettingsHandler::CreateExtensionDetailValue(

ManifestURL::GetHomepageURL(extension).is_valid());

string16 location_text;

- if (extension->location() == Manifest::EXTERNAL_POLICY_DOWNLOAD) {

+ if (extension->location() == Manifest::EXTERNAL_POLICY ||

+ extension->location() == Manifest::EXTERNAL_POLICY_DOWNLOAD) {

not at google - send to devlin 2013/09/23 21:17:32 there is a lot of this. perhaps add Manifest::IsPo

bartfab (slow) 2013/09/26 14:29:54 Done.

location_text = l10n_util::GetStringUTF16(

IDS_OPTIONS_INSTALL_LOCATION_ENTERPRISE);

} else if (extension->location() == Manifest::INTERNAL &&