| 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..5c03935fd0f8615760e403884526824cebcc34b7 100644
|
| --- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
|
| +++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
|
| @@ -79,22 +79,22 @@ PermissionMessages ChromePermissionMessageProvider::GetPermissionMessages(
|
| SuppressMessage(messages,
|
| PermissionMessage::kBookmarks,
|
| PermissionMessage::kOverrideBookmarksUI);
|
| - // Both tabs and history already allow reading favicons.
|
| + // History permission already allow reading favicons.
|
| SuppressMessage(messages,
|
| - PermissionMessage::kTabs,
|
| + PermissionMessage::kBrowsingHistoryRead,
|
| PermissionMessage::kFavicon);
|
| SuppressMessage(messages,
|
| - PermissionMessage::kBrowsingHistory,
|
| + PermissionMessage::kBrowsingHistoryWrite,
|
| PermissionMessage::kFavicon);
|
| - // Warning for history permission already covers warning for tabs permission.
|
| + // Warning for writing history already covers warning for reading history.
|
| SuppressMessage(messages,
|
| - PermissionMessage::kBrowsingHistory,
|
| - PermissionMessage::kTabs);
|
| + PermissionMessage::kBrowsingHistoryWrite,
|
| + PermissionMessage::kBrowsingHistoryRead);
|
| // Warning for full access permission already covers warning for tabs
|
| // permission.
|
| SuppressMessage(messages,
|
| PermissionMessage::kHostsAll,
|
| - PermissionMessage::kTabs);
|
| + PermissionMessage::kBrowsingHistoryRead);
|
|
|
| return messages;
|
| }
|
| @@ -162,15 +162,15 @@ std::vector<base::string16> ChromePermissionMessageProvider::GetWarningMessages(
|
| }
|
| }
|
| if (permissions->HasAPIPermission(APIPermission::kSessions) &&
|
| - id == PermissionMessage::kTabs) {
|
| + id == PermissionMessage::kBrowsingHistoryRead) {
|
| message_strings.push_back(l10n_util::GetStringUTF16(
|
| - IDS_EXTENSION_PROMPT_WARNING_TABS_AND_SESSIONS));
|
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_AND_SESSIONS));
|
| continue;
|
| }
|
| if (permissions->HasAPIPermission(APIPermission::kSessions) &&
|
| - id == PermissionMessage::kBrowsingHistory) {
|
| + id == PermissionMessage::kBrowsingHistoryWrite) {
|
| message_strings.push_back(l10n_util::GetStringUTF16(
|
| - IDS_EXTENSION_PROMPT_WARNING_BROWSING_HISTORY_AND_SESSIONS));
|
| + IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE_AND_SESSIONS));
|
| continue;
|
| }
|
|
|
|
|