summaryrefslogtreecommitdiffstats
path: root/extensions/shell/common
diff options
context:
space:
mode:
authortreib <treib@chromium.org>2015-03-16 03:20:46 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-16 10:21:40 +0000
commitb566ee83484dd1ef53e25dd24bbd6fe02d80daec (patch)
tree9427702b3fbf3b794055423b3789b00e94b49deb /extensions/shell/common
parent0aa91ca4ea9bb5b9403a8aeea29b4641b7241ab9 (diff)
downloadchromium_src-b566ee83484dd1ef53e25dd24bbd6fe02d80daec.zip
chromium_src-b566ee83484dd1ef53e25dd24bbd6fe02d80daec.tar.gz
chromium_src-b566ee83484dd1ef53e25dd24bbd6fe02d80daec.tar.bz2
Extensions: Prepare switch to new permission message system
PermissionMessageProvider: - add GetPermissionMessageStrings which calls either the old or the new system, based on a field trial - rename GetWarningMessages/GetWarningMessagesDetails to *Legacy* - replace GetPermissionMessages by GetLegacyPermissionMessageIDs -> remove the old PermissionMessages type from the interface Callers have *not* been updated to use the new GetPermissionMessageStrings yet. TBRing trivial change in ephemeral_app_launcher.cc TBR=asargent@chromium.org BUG=398257 Review URL: https://codereview.chromium.org/1006453002 Cr-Commit-Position: refs/heads/master@{#320702}
Diffstat (limited to 'extensions/shell/common')
-rw-r--r--extensions/shell/common/shell_extensions_client.cc14
1 files changed, 10 insertions, 4 deletions
diff --git a/extensions/shell/common/shell_extensions_client.cc b/extensions/shell/common/shell_extensions_client.cc
index 53476c4..072ebb1 100644
--- a/extensions/shell/common/shell_extensions_client.cc
+++ b/extensions/shell/common/shell_extensions_client.cc
@@ -42,10 +42,16 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider {
~ShellPermissionMessageProvider() override {}
// PermissionMessageProvider implementation.
- PermissionMessages GetPermissionMessages(
+ PermissionMessageStrings GetPermissionMessageStrings(
const PermissionSet* permissions,
Manifest::Type extension_type) const override {
- return PermissionMessages();
+ return PermissionMessageStrings();
+ }
+
+ PermissionMessageIDs GetLegacyPermissionMessageIDs(
+ const PermissionSet* permissions,
+ Manifest::Type extension_type) const override {
+ return PermissionMessageIDs();
}
CoalescedPermissionMessages GetCoalescedPermissionMessages(
@@ -53,13 +59,13 @@ class ShellPermissionMessageProvider : public PermissionMessageProvider {
return CoalescedPermissionMessages();
}
- std::vector<base::string16> GetWarningMessages(
+ std::vector<base::string16> GetLegacyWarningMessages(
const PermissionSet* permissions,
Manifest::Type extension_type) const override {
return std::vector<base::string16>();
}
- std::vector<base::string16> GetWarningMessagesDetails(
+ std::vector<base::string16> GetLegacyWarningMessagesDetails(
const PermissionSet* permissions,
Manifest::Type extension_type) const override {
return std::vector<base::string16>();