Update app info and install prompt UI to show retained devices.

chrome/browser/ui/webui/extensions/extension_settings_handler.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/ui/webui/extensions/extension_settings_handler.h"
 
 #include "apps/app_load_service.h"
+#include "apps/saved_devices_service.h"
 #include "apps/saved_files_service.h"
 #include "base/auto_reset.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 771 matching lines @@
 }
 
 void ExtensionSettingsHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }
 
 void ExtensionSettingsHandler::ExtensionWarningsChanged() {
   MaybeUpdateAfterNotification();
 }
 
-// This is called when the user clicks "Revoke File Access."
+// This is called when the user clicks "Revoke File/Device Access."
 void ExtensionSettingsHandler::InstallUIProceed() {
   Profile* profile = Profile::FromWebUI(web_ui());
+  apps::SavedDevicesService::Get(profile)->Clear(extension_id_prompting_);
   apps::SavedFilesService::Get(profile)->ClearQueue(
       extension_service_->GetExtensionById(extension_id_prompting_, true));
   apps::AppLoadService::Get(profile)
       ->RestartApplicationIfRunning(extension_id_prompting_);
   extension_id_prompting_.clear();
 }
 
 void ExtensionSettingsHandler::InstallUIAbort(bool user_initiated) {
   extension_id_prompting_.clear();
 }
@@ skipping 343 matching lines @@
   std::vector<base::FilePath> retained_file_paths;
   if (extension->permissions_data()->HasAPIPermission(
           APIPermission::kFileSystem)) {
     std::vector<apps::SavedFileEntry> retained_file_entries =
         apps::SavedFilesService::Get(Profile::FromWebUI(
             web_ui()))->GetAllFileEntries(extension_id_prompting_);
     for (size_t i = 0; i < retained_file_entries.size(); ++i) {
       retained_file_paths.push_back(retained_file_entries[i].path);
     }
   }
+  std::vector<base::string16> retained_device_messages;
+  if (extension->permissions_data()->HasAPIPermission(APIPermission::kUsb)) {
+    retained_device_messages =
+        apps::SavedDevicesService::Get(Profile::FromWebUI(web_ui()))
+            ->GetPermissionMessageStrings(extension_id_prompting_);
+  }
+
   // The BrokerDelegate manages its own lifetime.
-  prompt_->ReviewPermissions(
-      new BrokerDelegate(AsWeakPtr()), extension, retained_file_paths);
+  prompt_->ReviewPermissions(new BrokerDelegate(AsWeakPtr()),
+                             extension,
+                             retained_file_paths,
+                             retained_device_messages);
 }
 
 void ExtensionSettingsHandler::HandleShowButtonMessage(
     const base::ListValue* args) {
   const Extension* extension = GetActiveExtension(args);
   if (!extension)
     return;
   ExtensionActionAPI::SetBrowserActionVisibility(
       ExtensionPrefs::Get(extension_service_->profile()),
       extension->id(),
@@ skipping 238 matching lines @@
     extension_service_->EnableExtension(extension_id);
   } else {
     ExtensionErrorReporter::GetInstance()->ReportError(
         base::UTF8ToUTF16(JoinString(requirement_errors, ' ')),
         true);  // Be noisy.
   }
   requirements_checker_.reset();
 }
 
 }  // namespace extensions