Change topSites API permission warning

chrome/common/extensions/permissions/chrome_permission_message_provider.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h"
 
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/permissions/permission_message.h"
@@ skipping 63 matching lines @@
   messages.insert(messages.end(), manifest_permission_msgs.begin(),
                   manifest_permission_msgs.end());
 
   // Some warnings are more generic and/or powerful and superseed other
   // warnings. In that case, suppress the superseeded warning.
   SuppressMessage(messages,
                   PermissionMessage::kBookmarks,
                   PermissionMessage::kOverrideBookmarksUI);
   // Both tabs and history 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);

[wjywbs, 2014/06/13 15:42:47]

Granting all hosts permission will also allow "processes", "tabs", "topSites"
and "webNavigation".

 
   return messages;
 }
 
 std::vector<base::string16> ChromePermissionMessageProvider::GetWarningMessages(
     const PermissionSet* permissions,
     Manifest::Type extension_type) const {
   std::vector<base::string16> message_strings;
   PermissionMessages messages =
       GetPermissionMessages(permissions, extension_type);
@@ skipping 47 matching lines @@
             IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_DELETE;
         message_strings.push_back(l10n_util::GetStringUTF16(m_id));
         continue;
       } else if (id == PermissionMessage::kMediaGalleriesAllGalleriesCopyTo ||
                  id == PermissionMessage::kMediaGalleriesAllGalleriesDelete) {
         // The combined message will be pushed above.
         continue;
       }
     }
     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;
     }
 
     message_strings.push_back(i->message());
   }
 
   return message_strings;
 }
 
 std::vector<base::string16>
@@ skipping 183 matching lines @@
   std::set<std::string> old_hosts_set(
       permission_message_util::GetDistinctHosts(old_list, false, false));
   std::set<std::string> new_hosts_only =
       base::STLSetDifference<std::set<std::string> >(new_hosts_set,
                                                      old_hosts_set);
 
   return !new_hosts_only.empty();
 }
 
 }  // namespace extensions