Extensions: Switch to new permission message system, part III

chrome/browser/extensions/extension_disabled_ui.cc

 // Copyright (c) 2012 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/browser/extensions/extension_disabled_ui.h"
 
 #include <bitset>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 24 matching lines @@
 #include "content/public/browser/notification_source.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/browser/image_loader.h"
 #include "extensions/browser/notification_types.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "extensions/common/permissions/permission_message_provider.h"
-#include "extensions/common/permissions/permission_set.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia_operations.h"
 
 using extensions::Extension;
 
 namespace {
 
@@ skipping 229 matching lines @@
         base::UTF8ToUTF16(extension_->name()));
   } else {
     return l10n_util::GetStringFUTF16(IDS_EXTENSION_DISABLED_ERROR_TITLE,
                                       base::UTF8ToUTF16(extension_->name()));
   }
 }
 
 std::vector<base::string16>
 ExtensionDisabledGlobalError::GetBubbleViewMessages() {
   std::vector<base::string16> messages;
-  std::vector<base::string16> permission_warnings =
-      extensions::PermissionMessageProvider::Get()->GetLegacyWarningMessages(
+  extensions::PermissionMessageStrings permission_warnings =
+      extensions::PermissionMessageProvider::Get()->GetPermissionMessageStrings(
           extension_->permissions_data()->active_permissions().get(),
           extension_->GetType());
   if (is_remote_install_) {
     messages.push_back(l10n_util::GetStringFUTF16(
         extension_->is_app()
             ? IDS_APP_DISABLED_REMOTE_INSTALL_ERROR_LABEL
             : IDS_EXTENSION_DISABLED_REMOTE_INSTALL_ERROR_LABEL,
         base::UTF8ToUTF16(extension_->name())));
     if (!permission_warnings.empty())
       messages.push_back(
           l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO));
   } else {
     // TODO(treib): Add an extra message for supervised users. crbug.com/461261
     messages.push_back(l10n_util::GetStringFUTF16(
         extension_->is_app() ? IDS_APP_DISABLED_ERROR_LABEL
                              : IDS_EXTENSION_DISABLED_ERROR_LABEL,
         base::UTF8ToUTF16(extension_->name())));
     messages.push_back(l10n_util::GetStringUTF16(
         IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO));
   }
-  for (size_t i = 0; i < permission_warnings.size(); ++i) {
+  for (const extensions::PermissionMessageString& str : permission_warnings) {
     messages.push_back(l10n_util::GetStringFUTF16(
-        IDS_EXTENSION_PERMISSION_LINE, permission_warnings[i]));
+        IDS_EXTENSION_PERMISSION_LINE, str.message));
   }
   return messages;
 }
 
 base::string16 ExtensionDisabledGlobalError::GetBubbleViewAcceptButtonLabel() {
   if (extensions::util::IsExtensionSupervised(extension_,
                                               service_->profile())) {
     // TODO(treib): Probably use a new string here once we get UX design.
     // For now, just re-use an existing string that says "OK". crbug.com/461261
     return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_OK);
@@ skipping 126 matching lines @@
 void ShowExtensionDisabledDialog(ExtensionService* service,
                                  content::WebContents* web_contents,
                                  const Extension* extension) {
   scoped_ptr<ExtensionInstallPrompt> install_ui(
       new ExtensionInstallPrompt(web_contents));
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(service, install_ui.Pass(), extension);
 }
 
 }  // namespace extensions