summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authortreib <treib@chromium.org>2015-08-27 10:33:35 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-27 17:34:39 +0000
commitf9dce31fe5e41a1ae949efd15c3f04859c8f989b (patch)
treec78687e343aca593d9d2fa37372b2f164744e62c /extensions/shell
parentb60e4b98c9786aed73e09ccdc7ef270d4212db89 (diff)
downloadchromium_src-f9dce31fe5e41a1ae949efd15c3f04859c8f989b.zip
chromium_src-f9dce31fe5e41a1ae949efd15c3f04859c8f989b.tar.gz
chromium_src-f9dce31fe5e41a1ae949efd15c3f04859c8f989b.tar.bz2
Rename CoalescedPermissionMessage to PermissionMessage
It's now the only kind of permission message :) TBRing a bunch of trivial renames in c/b/ui. TBR=sky@chromium.org BUG=398257 Review URL: https://codereview.chromium.org/1309143003 Cr-Commit-Position: refs/heads/master@{#345913}
Diffstat (limited to 'extensions/shell')
-rw-r--r--extensions/shell/common/shell_extensions_client.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index 3b47c1b..cd0b9fa 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -42,9 +42,9 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider {
~ShellPermissionMessageProvider() override {}
// PermissionMessageProvider implementation.
- CoalescedPermissionMessages GetPermissionMessages(
+ PermissionMessages GetPermissionMessages(
const PermissionIDSet& permissions) const override {
- return CoalescedPermissionMessages();
+ return PermissionMessages();
}
bool IsPrivilegeIncrease(const PermissionSet* old_permissions,