| Index: chrome/common/extensions/permissions/chrome_permission_message_provider.cc
|
| ===================================================================
|
| --- chrome/common/extensions/permissions/chrome_permission_message_provider.cc (revision 274309)
|
| +++ chrome/common/extensions/permissions/chrome_permission_message_provider.cc (working copy)
|
| @@ -105,6 +105,7 @@
|
| bool media_galleries_read = false;
|
| bool media_galleries_copy_to = false;
|
| bool media_galleries_delete = false;
|
| + bool tabs = false;
|
| for (PermissionMessages::const_iterator i = messages.begin();
|
| i != messages.end(); ++i) {
|
| switch (i->id()) {
|
| @@ -123,6 +124,9 @@
|
| case PermissionMessage::kMediaGalleriesAllGalleriesDelete:
|
| media_galleries_delete = true;
|
| break;
|
| + case PermissionMessage::kTabs:
|
| + tabs = true;
|
| + break;
|
| default:
|
| break;
|
| }
|
| @@ -155,6 +159,12 @@
|
| continue;
|
| }
|
| }
|
| + if (tabs && permissions->HasAPIPermission(APIPermission::kSessions) &&
|
| + id == PermissionMessage::kTabs) {
|
| + message_strings.push_back(l10n_util::GetStringUTF16(
|
| + IDS_EXTENSION_PROMPT_WARNING_TABS_AND_SESSIONS));
|
| + continue;
|
| + }
|
|
|
| message_strings.push_back(i->message());
|
| }
|
|
|