summaryrefslogtreecommitdiffstats
path: root/extensions/shell/common
diff options
context:
space:
mode:
authorsashab <sashab@chromium.org>2015-02-22 16:38:19 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-23 00:38:44 +0000
commit63b2854330a8432e51e041b988cb397aa7a21463 (patch)
treea4d8dec18b6f6c6967a562c268065c488ed33313 /extensions/shell/common
parentf5183892c8cd02f16327b8c66394dc23535beeb9 (diff)
downloadchromium_src-63b2854330a8432e51e041b988cb397aa7a21463.zip
chromium_src-63b2854330a8432e51e041b988cb397aa7a21463.tar.gz
chromium_src-63b2854330a8432e51e041b988cb397aa7a21463.tar.bz2
Added GetCoalescedPermissionMessages to PermissionMessageProvider
Added a GetCoalescedPermissionMessages() method to PermissionMessageProvider and all its subclasses, including ChromePermissionMessageProvider. Also implemented the first set of rules to achieve parity with the existing apps/extensions permission messages system. Also updated PermissionsData to have a GetCoalescedPermissionMessages() function which returns the coalesced permission messages for an app or extension, and updated the unit tests to check the test output for both the legacy and new systems. No callsites that display permission messages have been updated to use the new system. BUG=398257 Review URL: https://codereview.chromium.org/798463003 Cr-Commit-Position: refs/heads/master@{#317533}
Diffstat (limited to 'extensions/shell/common')
-rw-r--r--extensions/shell/common/shell_extensions_client.cc11
1 files changed, 11 insertions, 0 deletions
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index 611ff99..53476c4 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -48,6 +48,11 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider {
return PermissionMessages();
}
+ CoalescedPermissionMessages GetCoalescedPermissionMessages(
+ const PermissionIDSet& permissions) const override {
+ return CoalescedPermissionMessages();
+ }
+
std::vector<base::string16> GetWarningMessages(
const PermissionSet* permissions,
Manifest::Type extension_type) const override {
@@ -68,6 +73,12 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider {
return false;
}
+ PermissionIDSet GetAllPermissionIDs(
+ const PermissionSet* permissions,
+ Manifest::Type extension_type) const override {
+ return PermissionIDSet();
+ }
+
private:
DISALLOW_COPY_AND_ASSIGN(ShellPermissionMessageProvider);
};