Remove knowledge of USB devices from permission prompt implementations.

chrome/browser/ui/views/extensions/device_permissions_dialog_view.cc

 // Copyright 2014 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/views/extensions/device_permissions_dialog_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/chrome_device_permissions_prompt.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/constrained_window/constrained_window_views.h"
@@ skipping 57 matching lines @@
   observer_ = observer;
 }
 
 void DevicePermissionsTableModel::OnDevicesChanged() {
   if (observer_) {
     observer_->OnModelChanged();
   }
 }
 
 DevicePermissionsDialogView::DevicePermissionsDialogView(
-    DevicePermissionsPrompt::Delegate* delegate,
     scoped_refptr<DevicePermissionsPrompt::Prompt> prompt)
-    : delegate_(delegate), prompt_(prompt) {
+    : prompt_(prompt) {
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kVertical,
                            views::kButtonHEdgeMarginNew,
                            0,
                            views::kRelatedControlVerticalSpacing);
   SetLayoutManager(layout);
 
   views::Label* label = new views::Label(prompt_->GetPromptMessage());
   label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label->SetMultiLine(true);
@@ skipping 24 matching lines @@
   views::View* table_parent = table_view_->CreateParentIfNecessary();
   AddChildView(table_parent);
   layout->SetFlexForView(table_parent, 1);
 }
 
 DevicePermissionsDialogView::~DevicePermissionsDialogView() {
   RemoveAllChildViews(true);
 }
 
 bool DevicePermissionsDialogView::Cancel() {
-  std::vector<scoped_refptr<UsbDevice>> empty;
-  delegate_->OnUsbDevicesChosen(empty);
+  prompt_->Dismissed();
   return true;
 }
 
 bool DevicePermissionsDialogView::Accept() {
-  std::vector<scoped_refptr<UsbDevice>> devices;
   for (int index : table_view_->selection_model().selected_indices()) {
     prompt_->GrantDevicePermission(index);
-    devices.push_back(prompt_->GetDevice(index));
   }
-  delegate_->OnUsbDevicesChosen(devices);
+  prompt_->Dismissed();
   return true;
 }
 
 base::string16 DevicePermissionsDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK) {
     return l10n_util::GetStringUTF16(IDS_DEVICE_PERMISSIONS_DIALOG_SELECT);
   }
   return views::DialogDelegateView::GetDialogButtonLabel(button);
 }
 
 ui::ModalType DevicePermissionsDialogView::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
 base::string16 DevicePermissionsDialogView::GetWindowTitle() const {
   return prompt_->GetHeading();
 }
 
 gfx::Size DevicePermissionsDialogView::GetPreferredSize() const {
   return gfx::Size(500, 250);
 }
 
 void ChromeDevicePermissionsPrompt::ShowDialog() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   constrained_window::ShowWebModalDialogViews(
-      new DevicePermissionsDialogView(delegate(), prompt()), web_contents());
+      new DevicePermissionsDialogView(prompt()), web_contents());
 }