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

Unified Diff: chrome/common/extensions/extension.cc

Issue 6992022: Move Proxy Settings API out of experimental (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed remainder of merge conflict. Fixes unit test Created 9 years, 7 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
Index: chrome/common/extensions/extension.cc
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 788fc89dba3e1bd1e6366f3dc2f3a75ded58ba32..bd62b97b4f33a2282928b515059eed21e8f2e3d7 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -110,6 +110,7 @@ const char kI18NModuleName[] = "i18n";
const char kOmniboxModuleName[] = "omnibox";
const char kPageActionModuleName[] = "pageAction";
const char kPageActionsModuleName[] = "pageActions";
+const char kPreferenceModuleName[] = "preferences";
const char kTestModuleName[] = "test";
// Names of modules that can be used without listing it in the permissions
@@ -123,6 +124,7 @@ const char* kNonPermissionModuleNames[] = {
kOmniboxModuleName,
kPageActionModuleName,
kPageActionsModuleName,
+ kPreferenceModuleName,
kTestModuleName
};
const size_t kNumNonPermissionModuleNames =
« no previous file with comments | « chrome/common/extensions/docs/static/proxy.html ('k') | chrome/renderer/resources/extension_process_bindings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698