Extensions: Switch to new permission message system, part I

extensions/common/permissions/permissions_data.h

 // Copyright (c) 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.
 
 #ifndef EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_DATA_H_
 #define EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_DATA_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/permissions/api_permission.h"
 #include "extensions/common/permissions/coalesced_permission_message.h"
 #include "extensions/common/permissions/permission_message.h"
+#include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permission_set.h"
 
 class GURL;
 
 namespace extensions {
 class Extension;
 class URLPatternSet;
 
 // A container for the permissions state of an extension, including active,
 // withheld, and tab-specific permissions.
@@ skipping 35 matching lines @@
   static bool CanExecuteScriptEverywhere(const Extension* extension);
 
   // Returns true if the --scripts-require-action flag would possibly affect
   // the given |extension| and |permissions|. We pass in the |permissions|
   // explicitly, as we may need to check with permissions other than the ones
   // that are currently on the extension's PermissionsData.
   static bool ScriptsMayRequireActionForExtension(
       const Extension* extension,
       const PermissionSet* permissions);
 
-  // Returns true if we should skip the permisisons warning for the extension
+  // Returns true if we should skip the permissions warning for the extension
   // with the given |extension_id|.
   static bool ShouldSkipPermissionWarnings(const std::string& extension_id);
 
   // Returns true if the given |url| is restricted for the given |extension|,
   // as is commonly the case for chrome:// urls.
   // NOTE: You probably want to use CanAccessPage().
   static bool IsRestrictedUrl(const GURL& document_url,
                               const GURL& top_frame_url,
                               const Extension* extension,
                               std::string* error);
@@ skipping 46 matching lines @@
   // network, etc.)
   bool HasEffectiveAccessToAllHosts() const;
 
   // Returns the full list of legacy permission message IDs.
   // Deprecated. You DO NOT want to call this!
   // TODO(treib): Remove once we've switched to the new system.
   PermissionMessageIDs GetLegacyPermissionMessageIDs() const;
 
   // Returns the full list of permission messages that should display at install
   // time as strings.
-  // TODO(sashab): Deprecate this in favor of GetCoalescedPermissionMessages().
-  std::vector<base::string16> GetPermissionMessageStrings() const;
+  PermissionMessageStrings GetPermissionMessageStrings() const;
+
+  // Returns the full list of permission messages that should display at install
+  // time as strings.
+  // TODO(sashab): Deprecate this in favor of GetPermissionMessageStrings.
+  std::vector<base::string16> GetLegacyPermissionMessageStrings() const;
 
   // Returns the full list of permission details for messages that should
   // display at install time as strings.
-  // TODO(sashab): Deprecate this in favor of GetCoalescedPermissionMessages().
-  std::vector<base::string16> GetPermissionMessageDetailsStrings() const;
+  // TODO(sashab): Deprecate this in favor of GetPermissionMessageStrings.
+  std::vector<base::string16> GetLegacyPermissionMessageDetailsStrings() const;
 
   // Returns the full list of permission details for messages that should
   // display at install time, in a nested format ready for display.
   CoalescedPermissionMessages GetCoalescedPermissionMessages() const;
 
   // Returns true if the extension has requested all-hosts permissions (or
   // something close to it), but has had it withheld.
   bool HasWithheldImpliedAllHosts() const;
 
   // Returns true if the |extension| has permission to access and interact with
@@ skipping 119 matching lines @@
   mutable scoped_refptr<const PermissionSet> withheld_permissions_unsafe_;
 
   mutable TabPermissionsMap tab_specific_permissions_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionsData);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_PERMISSIONS_PERMISSIONS_DATA_H_