Update device permissions dialog ui for Chrome apps and extensions

extensions/browser/api/device_permissions_prompt.cc

Index: extensions/browser/api/device_permissions_prompt.cc
diff --git a/extensions/browser/api/device_permissions_prompt.cc b/extensions/browser/api/device_permissions_prompt.cc
index a24ade99f1b7728f9d83025292e9b96a41271643..6b2b7348fa553a592115fedef5ca747f582b89f5 100644
--- a/extensions/browser/api/device_permissions_prompt.cc
+++ b/extensions/browser/api/device_permissions_prompt.cc
@@ -22,7 +22,6 @@
 #include "device/usb/usb_service.h"
 #include "extensions/browser/api/device_permissions_manager.h"
 #include "extensions/common/extension.h"
-#include "extensions/strings/grit/extensions_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
@@ -99,11 +98,6 @@ class UsbDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
     }
   }
 
-  base::string16 GetHeading() const override {
-    return l10n_util::GetSingleOrMultipleStringUTF16(
-        IDS_USB_DEVICE_PERMISSIONS_PROMPT_TITLE, multiple());
-  }
-
   void Dismissed() override {
     DevicePermissionsManager* permissions_manager =
         DevicePermissionsManager::Get(browser_context());
@@ -140,9 +134,10 @@ class UsbDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
       const UsbDeviceInfo* entry =
           static_cast<const UsbDeviceInfo*>((*it).get());
       if (entry->device() == device) {
+        size_t index = it - devices_.begin();
         devices_.erase(it);
         if (observer()) {
-          observer()->OnDevicesChanged();
+          observer()->OnDeviceRemoved(index);
         }
         return;
       }
@@ -213,11 +208,6 @@ class HidDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
     }
   }
 
-  base::string16 GetHeading() const override {
-    return l10n_util::GetSingleOrMultipleStringUTF16(
-        IDS_HID_DEVICE_PERMISSIONS_PROMPT_TITLE, multiple());
-  }
-
   void Dismissed() override {
     DevicePermissionsManager* permissions_manager =
         DevicePermissionsManager::Get(browser_context());
@@ -264,9 +254,10 @@ class HidDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
       const HidDeviceInfo* entry =
           static_cast<const HidDeviceInfo*>((*it).get());
       if (entry->device() == device) {
+        size_t index = it - devices_.begin();
         devices_.erase(it);
         if (observer()) {
-          observer()->OnDevicesChanged();
+          observer()->OnDeviceRemoved(index);
         }

[Reilly Grant (use Gerrit), 2016/11/23 02:07:48]

nit: while you're modifying this statement, remove the braces

[juncai, 2016/11/23 22:43:48]

Done.

         return;
       }
@@ -315,12 +306,6 @@ void DevicePermissionsPrompt::Prompt::SetObserver(Observer* observer) {
   observer_ = observer;
 }
 
-base::string16 DevicePermissionsPrompt::Prompt::GetPromptMessage() const {
-  return base::i18n::MessageFormatter::FormatWithNumberedArgs(
-      l10n_util::GetStringUTF16(IDS_DEVICE_PERMISSIONS_PROMPT),
-      multiple_ ? "multiple" : "single", extension_->name());
-}
-
 base::string16 DevicePermissionsPrompt::Prompt::GetDeviceName(
     size_t index) const {
   DCHECK_LT(index, devices_.size());
@@ -347,7 +332,7 @@ void DevicePermissionsPrompt::Prompt::AddCheckedDevice(
   if (allowed) {
     devices_.push_back(std::move(device));
     if (observer_) {
-      observer_->OnDevicesChanged();
+      observer_->OnDeviceAdded(devices_.size() - 1);
     }

[Reilly Grant (use Gerrit), 2016/11/23 02:07:48]

nit: while you're modifying this statement, remove the braces

[juncai, 2016/11/23 22:43:48]

Done.

   }
 }