diff options
| author | jochen <jochen@chromium.org> | 2014-12-10 00:59:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-10 09:00:12 +0000 |
| commit | 99ec6733eda11730c9a30ad338d8ed4bbf6791d4 (patch) | |
| tree | 2be4539310a9060ec533d299a1c48fe61dccf869 /extensions/shell/common | |
| parent | 553ba63a6393d3f67d6dd5d1c8bacfd42ac0e3d9 (diff) | |
| download | chromium_src-99ec6733eda11730c9a30ad338d8ed4bbf6791d4.zip chromium_src-99ec6733eda11730c9a30ad338d8ed4bbf6791d4.tar.gz chromium_src-99ec6733eda11730c9a30ad338d8ed4bbf6791d4.tar.bz2 | |
Revert of Added CoalescedPermissionMessages to ManifestPermissions (patchset #6 id:160001 of https://codereview.chromium.org/750353003/)
Reason for revert:
Static initializers in permission message utils
Original issue's description:
> Added CoalescedPermissionMessages to ManifestPermissions
>
> Added a new type, CoalescedPermissionMessage, which represents a
> permission message made up of 0 or more permissions. Also started a
> refactor to move IDs out of APIPermission::ID and PermissionMessage::ID
> and into their own common class.
>
> Added a new method GetPermissions() to ManifestPermission, which allows
> manifest permissions to specify their own custom permissions (and hence
> custom messages) for apps with that permission. Updated all 5 subclasses
> (automation, bluetooth, sockets, UI overrides hanlder and the mock
> manifest).
>
> Also added another FilterHostPermissions() method to ExtensionsClient
> that can create CoalescedPermissionMessages.
>
> BUG=398257
>
> Committed: https://crrev.com/45d827a6ba247ef55275c52ade2dfddbaeb87a9f
> Cr-Commit-Position: refs/heads/master@{#307630}
TBR=yoz@chromium.org,sashab@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=398257
Review URL: https://codereview.chromium.org/793633003
Cr-Commit-Position: refs/heads/master@{#307660}
Diffstat (limited to 'extensions/shell/common')
| -rw-r--r-- | extensions/shell/common/shell_extensions_client.cc | 7 | ||||
| -rw-r--r-- | extensions/shell/common/shell_extensions_client.h | 3 |
2 files changed, 0 insertions, 10 deletions
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc index 3f7bc48..a598ded 100644 --- a/extensions/shell/common/shell_extensions_client.cc +++ b/extensions/shell/common/shell_extensions_client.cc @@ -147,13 +147,6 @@ void ShellExtensionsClient::FilterHostPermissions( NOTIMPLEMENTED(); } -void ShellExtensionsClient::FilterHostPermissions( - const URLPatternSet& hosts, - URLPatternSet* new_hosts, - PermissionIDSet* permissions) const { - NOTIMPLEMENTED(); -} - void ShellExtensionsClient::SetScriptingWhitelist( const ScriptingWhitelist& whitelist) { scripting_whitelist_ = whitelist; diff --git a/extensions/shell/common/shell_extensions_client.h b/extensions/shell/common/shell_extensions_client.h index 3e5e9bb..cbb72e1 100644 --- a/extensions/shell/common/shell_extensions_client.h +++ b/extensions/shell/common/shell_extensions_client.h @@ -31,9 +31,6 @@ class ShellExtensionsClient : public ExtensionsClient { const URLPatternSet& hosts, URLPatternSet* new_hosts, std::set<PermissionMessage>* messages) const override; - void FilterHostPermissions(const URLPatternSet& hosts, - URLPatternSet* new_hosts, - PermissionIDSet* permissions) const override; void SetScriptingWhitelist(const ScriptingWhitelist& whitelist) override; const ScriptingWhitelist& GetScriptingWhitelist() const override; URLPatternSet GetPermittedChromeSchemeHosts( |