| 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 c999ce066d39c25b8ad89f9589b86de2c7efd45b..26a5ae4693564a2b7aa4e46377cd583a2b66e826 100644
|
| --- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
|
| +++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc
|
| @@ -257,14 +257,10 @@ ChromePermissionMessageProvider::GetAPIPermissionMessages(
|
| }
|
|
|
| // A special hack: If kFileSystemWriteDirectory would be displayed, hide
|
| - // kFileSystemDirectory and and kFileSystemWrite as the write directory
|
| - // message implies the other two.
|
| + // kFileSystemDirectory as the write directory message implies it.
|
| // TODO(sammc): Remove this. See http://crbug.com/284849.
|
| SuppressMessage(messages,
|
| PermissionMessage::kFileSystemWriteDirectory,
|
| - PermissionMessage::kFileSystemWrite);
|
| - SuppressMessage(messages,
|
| - PermissionMessage::kFileSystemWriteDirectory,
|
| PermissionMessage::kFileSystemDirectory);
|
| // A special hack: The warning message for declarativeWebRequest
|
| // permissions speaks about blocking parts of pages, which is a
|
| @@ -335,8 +331,7 @@ bool ChromePermissionMessageProvider::IsAPIPrivilegeIncrease(
|
| PermissionMsgSet delta_warnings =
|
| base::STLSetDifference<PermissionMsgSet>(new_warnings, old_warnings);
|
|
|
| - // A special hack: kFileSystemWriteDirectory implies kFileSystemDirectory and
|
| - // kFileSystemWrite.
|
| + // A special hack: kFileSystemWriteDirectory implies kFileSystemDirectory.
|
| // TODO(sammc): Remove this. See http://crbug.com/284849.
|
| if (old_warnings.find(PermissionMessage(
|
| PermissionMessage::kFileSystemWriteDirectory, base::string16())) !=
|
| @@ -344,9 +339,6 @@ bool ChromePermissionMessageProvider::IsAPIPrivilegeIncrease(
|
| delta_warnings.erase(
|
| PermissionMessage(PermissionMessage::kFileSystemDirectory,
|
| base::string16()));
|
| - delta_warnings.erase(
|
| - PermissionMessage(PermissionMessage::kFileSystemWrite,
|
| - base::string16()));
|
| }
|
|
|
| // It is a privilege increase if there are additional warnings present.
|
|
|