Extensions: Switch to new permission message system, part II

chrome/common/extensions/permissions/chrome_permission_message_rules.cc

 // Copyright 2014 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_rules.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "chrome/grit/generated_resources.h"
 #include "extensions/common/permissions/api_permission_set.h"
@@ skipping 327 matching lines @@
       {IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ_DELETE,
        {APIPermission::kMediaGalleriesAllGalleriesDelete,
         APIPermission::kMediaGalleriesAllGalleriesRead},
        {}},
       {IDS_EXTENSION_PROMPT_WARNING_MEDIA_GALLERIES_READ,
        {APIPermission::kMediaGalleriesAllGalleriesRead},
        {}},
 
       {IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE_AND_SESSIONS,
        {APIPermission::kSessions, APIPermission::kHistory},
-       {APIPermission::kTab,
-        APIPermission::kFavicon,
+       {APIPermission::kFavicon,
         APIPermission::kProcesses,
+        APIPermission::kTab,
         APIPermission::kTopSites,
         APIPermission::kWebNavigation}},
       {IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ_AND_SESSIONS,
        {APIPermission::kSessions, APIPermission::kTab},
        {APIPermission::kFavicon,
         APIPermission::kProcesses,
         APIPermission::kTopSites,
         APIPermission::kWebNavigation}},
 
       // Suppression list taken from
       // ChromePermissionMessageProvider::GetPermissionMessages():
       // Some warnings are more generic and/or powerful and supercede other
       // warnings. In that case, the first message suppresses the second one.
       {IDS_EXTENSION_PROMPT_WARNING_BLUETOOTH,
        {APIPermission::kBluetooth},
        {APIPermission::kBluetoothDevices}},
       {IDS_EXTENSION_PROMPT_WARNING_BOOKMARKS,
        {APIPermission::kBookmark},
        {APIPermission::kOverrideBookmarksUI}},
       // History already allows reading favicons, tab access and accessing the
       // list of most frequently visited sites.
       {IDS_EXTENSION_PROMPT_WARNING_HISTORY_WRITE,
        {APIPermission::kHistory},
        {APIPermission::kFavicon,
+        APIPermission::kProcesses,
         APIPermission::kTab,
-        APIPermission::kTopSites}},
+        APIPermission::kTopSites,
+        APIPermission::kWebNavigation}},
       // A special hack: If kFileSystemWriteDirectory would be displayed, hide
       // kFileSystemDirectory as the write directory message implies it.
       // TODO(sashab): Remove kFileSystemWriteDirectory; it's no longer needed
       // since this rules system can represent the rule. See crbug.com/284849.
       {IDS_EXTENSION_PROMPT_WARNING_FILE_SYSTEM_WRITE_DIRECTORY,
        {APIPermission::kFileSystemWrite, APIPermission::kFileSystemDirectory},
        {APIPermission::kFileSystemWriteDirectory}},
       // Full access already allows DeclarativeWebRequest, reading the list of
       // most frequently visited sites, and tab access.
       // The warning message for declarativeWebRequest
@@ skipping 10 matching lines @@
         APIPermission::kTopSites,
         APIPermission::kHostsAllReadOnly}},
       // AutomationManifestPermission:
       {IDS_EXTENSION_PROMPT_WARNING_ALL_HOSTS_READ_ONLY,
        {APIPermission::kHostsAllReadOnly},
        {}},
       // Tabs already allows reading favicons and reading the list of most
       // frequently visited sites.
       {IDS_EXTENSION_PROMPT_WARNING_HISTORY_READ,
        {APIPermission::kTab},
-       {APIPermission::kFavicon, APIPermission::kTopSites}},
+       {APIPermission::kFavicon,
+        APIPermission::kProcesses,
+        APIPermission::kTopSites,
+        APIPermission::kWebNavigation}},
 
       // Individual message rules taken from
       // ChromeAPIPermissions::GetAllPermissions():
       // Permission messages for all extension types:
 
       {IDS_EXTENSION_PROMPT_WARNING_CLIPBOARD,
        {APIPermission::kClipboardRead},
        {}},
       {IDS_EXTENSION_PROMPT_WARNING_DESKTOP_CAPTURE,
        {APIPermission::kDesktopCapture},
@@ skipping 243 matching lines @@
   insert(permission_four);
   insert(permission_five);
   insert(permission_six);
 }
 
 ChromePermissionMessageRule::PermissionIDSetInitializer::
     ~PermissionIDSetInitializer() {
 }
 
 }  // namespace extensions