Index: chrome/common/extensions/permissions/chrome_permission_message_provider.cc |
diff --git a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc |
index 9fb3c84fe4c268383e51a1132b92be1b98c147a4..74dd071db0cf43fbcf087c5923bea878d627aefb 100644 |
--- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc |
+++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc |
@@ -86,10 +86,19 @@ PermissionMessages ChromePermissionMessageProvider::GetPermissionMessages( |
SuppressMessage(messages, |
PermissionMessage::kBrowsingHistory, |
PermissionMessage::kFavicon); |
- // Warning for history permission already covers warning for tabs permission. |
+ // Warning for history permission already covers warning for tabs and |
+ // topSites permission. |
SuppressMessage(messages, |
PermissionMessage::kBrowsingHistory, |
PermissionMessage::kTabs); |
+ SuppressMessage(messages, |
+ PermissionMessage::kBrowsingHistory, |
+ PermissionMessage::kTopSites); |
+ // Warning for topSites permission already covers warning for tabs |
+ // permission. |
+ SuppressMessage(messages, |
+ PermissionMessage::kTopSites, |
+ PermissionMessage::kTabs); |
meacer
2014/06/11 20:03:10
See my comment below: if we just had "read browsin
|
// Warning for full access permission already covers warning for tabs |
// permission. |
SuppressMessage(messages, |
@@ -162,7 +171,8 @@ std::vector<base::string16> ChromePermissionMessageProvider::GetWarningMessages( |
} |
} |
if (permissions->HasAPIPermission(APIPermission::kSessions) && |
- id == PermissionMessage::kTabs) { |
+ (id == PermissionMessage::kTabs || |
+ id == PermissionMessage::kTopSites)) { |
message_strings.push_back(l10n_util::GetStringUTF16( |
IDS_EXTENSION_PROMPT_WARNING_TABS_AND_SESSIONS)); |
meacer
2014/06/11 20:03:10
This is getting a bit complicated. The warning for
wjywbs
2014/06/11 23:43:18
The "tabs" API does not have any access to the his
meacer
2014/06/12 00:05:08
I mean, it kind of does, depending on one's defini
|
continue; |