Extensions: Switch to new permission message system, part I

extensions/common/permissions/permissions_data.cc

 // 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.
 
 #include "extensions/common/permissions/permissions_data.h"
 
 #include "base/command_line.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/permissions_parser.h"
-#include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permission_message_util.h"
 #include "extensions/common/switches.h"
 #include "extensions/common/url_pattern_set.h"
 #include "url/gurl.h"
 #include "url/url_constants.h"
 
 namespace extensions {
 
 namespace {
 
@@ skipping 171 matching lines @@
 
 PermissionMessageIDs PermissionsData::GetLegacyPermissionMessageIDs() const {
   if (ShouldSkipPermissionWarnings(extension_id_)) {
     return PermissionMessageIDs();
   } else {
     return PermissionMessageProvider::Get()->GetLegacyPermissionMessageIDs(
         active_permissions().get(), manifest_type_);
   }
 }
 
-std::vector<base::string16> PermissionsData::GetPermissionMessageStrings()
+PermissionMessageStrings PermissionsData::GetPermissionMessageStrings() const {
+  if (ShouldSkipPermissionWarnings(extension_id_))
+    return PermissionMessageStrings();
+  return PermissionMessageProvider::Get()->GetPermissionMessageStrings(
+      active_permissions().get(), manifest_type_);
+}
+
+std::vector<base::string16> PermissionsData::GetLegacyPermissionMessageStrings()
     const {
   if (ShouldSkipPermissionWarnings(extension_id_))
     return std::vector<base::string16>();
   return PermissionMessageProvider::Get()->GetLegacyWarningMessages(
       active_permissions().get(), manifest_type_);
 }
 
 std::vector<base::string16>
-PermissionsData::GetPermissionMessageDetailsStrings() const {
+PermissionsData::GetLegacyPermissionMessageDetailsStrings() const {
   if (ShouldSkipPermissionWarnings(extension_id_))
     return std::vector<base::string16>();
   return PermissionMessageProvider::Get()->GetLegacyWarningMessagesDetails(
       active_permissions().get(), manifest_type_);
 }
 
 CoalescedPermissionMessages PermissionsData::GetCoalescedPermissionMessages()
     const {
   return PermissionMessageProvider::Get()->GetCoalescedPermissionMessages(
       PermissionMessageProvider::Get()->GetAllPermissionIDs(
@@ skipping 153 matching lines @@
     return ACCESS_WITHHELD;
 
   if (error) {
     *error = ErrorUtils::FormatErrorMessage(manifest_errors::kCannotAccessPage,
                                             document_url.spec());
   }
   return ACCESS_DENIED;
 }
 
 }  // namespace extensions