diff options
| author | aboxhall@chromium.org <aboxhall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 05:20:44 +0000 |
|---|---|---|
| committer | aboxhall@chromium.org <aboxhall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-06 05:20:44 +0000 |
| commit | c7df0e15c762774bfa4dd720defda5ee6598d2cb (patch) | |
| tree | a662ed68cc61b7eb7a9e39ca53d15107f8d22fbe /extensions | |
| parent | c4672c70d2d2f18233d2c87ac08c3398aecfdd8a (diff) | |
| download | chromium_src-c7df0e15c762774bfa4dd720defda5ee6598d2cb.zip chromium_src-c7df0e15c762774bfa4dd720defda5ee6598d2cb.tar.gz chromium_src-c7df0e15c762774bfa4dd720defda5ee6598d2cb.tar.bz2 | |
Implement manifest parsing for Automation permissions.
Nothing is wired up yet other than checking for automation permission in general, but the parsing all works, so it's just a matter of enforcing these permissions going forward.
BUG=309681
Review URL: https://codereview.chromium.org/261873002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/common/manifest_constants.cc | 1 | ||||
| -rw-r--r-- | extensions/common/manifest_constants.h | 1 | ||||
| -rw-r--r-- | extensions/common/manifest_handlers/externally_connectable.cc | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/extensions/common/manifest_constants.cc b/extensions/common/manifest_constants.cc index 03129a3..cc574d9 100644 --- a/extensions/common/manifest_constants.cc +++ b/extensions/common/manifest_constants.cc @@ -11,6 +11,7 @@ namespace manifest_keys { const char kAllFrames[] = "all_frames"; const char kAltKey[] = "altKey"; const char kApp[] = "app"; +const char kAutomation[] = "automation"; const char kBackgroundAllowJsAccess[] = "background.allow_js_access"; const char kBackgroundPage[] = "background.page"; const char kBackgroundPageLegacy[] = "background_page"; diff --git a/extensions/common/manifest_constants.h b/extensions/common/manifest_constants.h index 15bff25..4579852 100644 --- a/extensions/common/manifest_constants.h +++ b/extensions/common/manifest_constants.h @@ -13,6 +13,7 @@ namespace manifest_keys { extern const char kAllFrames[]; extern const char kAltKey[]; extern const char kApp[]; +extern const char kAutomation[]; extern const char kBackgroundAllowJsAccess[]; extern const char kBackgroundPage[]; extern const char kBackgroundPageLegacy[]; diff --git a/extensions/common/manifest_handlers/externally_connectable.cc b/extensions/common/manifest_handlers/externally_connectable.cc index 1261ad8..859e520 100644 --- a/extensions/common/manifest_handlers/externally_connectable.cc +++ b/extensions/common/manifest_handlers/externally_connectable.cc @@ -64,8 +64,9 @@ bool ExternallyConnectableHandler::Parse(Extension* extension, &externally_connectable)); std::vector<InstallWarning> install_warnings; scoped_ptr<ExternallyConnectableInfo> info = - ExternallyConnectableInfo::FromValue( - *externally_connectable, &install_warnings, error); + ExternallyConnectableInfo::FromValue(*externally_connectable, + &install_warnings, + error); if (!info) return false; if (!info->matches.is_empty()) { |