chrome/browser/policy/configuration_policy_handler_list.cc - Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file.

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/policy/configuration_policy_handler_list.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 11 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/performance_monitor/performance_monitor_browsertest.cc ('k') | chrome/browser/renderer_host/chrome_render_view_host_observer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_handler_list.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc

index fd4ed8adee1e001ed4da44f8c2ce26f1fff5f796..a80912b3a87f92c2d003c4ee43dbb2c487e38810 100644

--- a/chrome/browser/policy/configuration_policy_handler_list.cc

+++ b/chrome/browser/policy/configuration_policy_handler_list.cc

@@ -10,7 +10,7 @@

#include "chrome/browser/policy/configuration_policy_handler.h"

#include "chrome/browser/policy/policy_error_map.h"

#include "chrome/browser/policy/policy_map.h"

-#include "chrome/common/extensions/extension.h"

+#include "chrome/common/extensions/manifest.h"

#include "chrome/common/pref_names.h"

#include "chromeos/network/onc/onc_constants.h"

#include "grit/generated_resources.h"

@@ -355,14 +355,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {

#endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS)

};

-// Mapping from extension type names to Extension::Type.

+// Mapping from extension type names to Manifest::Type.

StringToIntEnumListPolicyHandler::MappingEntry kExtensionAllowedTypesMap[] = {

- { "extension", extensions::Extension::TYPE_EXTENSION },

- { "theme", extensions::Extension::TYPE_THEME },

- { "user_script", extensions::Extension::TYPE_USER_SCRIPT },

- { "hosted_app", extensions::Extension::TYPE_HOSTED_APP },

- { "legacy_packaged_app", extensions::Extension::TYPE_LEGACY_PACKAGED_APP },

- { "platform_app", extensions::Extension::TYPE_PLATFORM_APP },

+ { "extension", extensions::Manifest::TYPE_EXTENSION },

+ { "theme", extensions::Manifest::TYPE_THEME },

+ { "user_script", extensions::Manifest::TYPE_USER_SCRIPT },

+ { "hosted_app", extensions::Manifest::TYPE_HOSTED_APP },

+ { "legacy_packaged_app", extensions::Manifest::TYPE_LEGACY_PACKAGED_APP },

+ { "platform_app", extensions::Manifest::TYPE_PLATFORM_APP },

};

} // namespace