diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
| commit | a36e5920737c6adbddd3e43b760e5de8431db6e0 (patch) | |
| tree | 347d048bb8c8828d50113bf94ace40bf0613f2cd /extensions | |
| parent | 34378da0e9429d394aafdaa771301aff58447cb1 (diff) | |
| download | chromium_org-a36e5920737c6adbddd3e43b760e5de8431db6e0.tar.gz | |
Merge from Chromium at DEPS revision r215573
This commit was generated by merge_to_master.py.
Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/common/switches.cc | 4 | ||||
| -rw-r--r-- | extensions/common/switches.h | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/extensions/common/switches.cc b/extensions/common/switches.cc index f85ff4b9f8..228a557fa5 100644 --- a/extensions/common/switches.cc +++ b/extensions/common/switches.cc @@ -18,6 +18,10 @@ const char kAllowLegacyExtensionManifests[] = // automation testing of the gallery. const char kAllowScriptingGallery[] = "allow-scripting-gallery"; +// Enables extension APIs that are in development. +const char kEnableExperimentalExtensionApis[] = + "enable-experimental-extension-apis"; + // Enables extensions running scripts on chrome:// URLs. // Extensions still need to explicitly request access to chrome:// URLs in the // manifest. diff --git a/extensions/common/switches.h b/extensions/common/switches.h index c24d35b757..7fceb54e9d 100644 --- a/extensions/common/switches.h +++ b/extensions/common/switches.h @@ -13,6 +13,7 @@ namespace switches { extern const char kAllowLegacyExtensionManifests[]; extern const char kAllowScriptingGallery[]; +extern const char kEnableExperimentalExtensionApis[]; extern const char kExtensionsOnChromeURLs[]; extern const char kShowComponentExtensionOptions[]; |