Remove Close button for chooser bubble and call CloseBubble when Cancel

chrome/browser/usb/usb_chooser_bubble_delegate.cc

 // Copyright 2015 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/usb/usb_chooser_bubble_delegate.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
+#include "components/bubble/bubble_controller.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "device/core/device_client.h"
 #include "device/devices_app/usb/type_converters.h"
 #include "device/usb/usb_device.h"
 #include "device/usb/usb_device_filter.h"
 #include "url/gurl.h"
 
 namespace {
 
@@ skipping 73 matching lines @@
         render_frame_host_->GetLastCommittedURL().GetOrigin(), embedding_origin,
         devices_[idx]->guid());
 
     device::usb::DeviceInfoPtr device_info_ptr =
         device::usb::DeviceInfo::From(*devices_[idx]);
     callback_.Run(device_info_ptr.Pass());
   } else {
     callback_.Run(nullptr);
   }
   callback_.reset();  // Reset |callback_| so that it is only run once.
+
+  if (bubble_controller_)
+    bubble_controller_->CloseBubble(BUBBLE_CLOSE_ACCEPTED);
 }
 
-void UsbChooserBubbleDelegate::Cancel() {}
+void UsbChooserBubbleDelegate::Cancel() {
+  if (bubble_controller_)
+    bubble_controller_->CloseBubble(BUBBLE_CLOSE_CANCELED);
+}
 
 void UsbChooserBubbleDelegate::Close() {}
 
 void UsbChooserBubbleDelegate::OnDeviceAdded(
     scoped_refptr<device::UsbDevice> device) {
   DCHECK(!ContainsValue(devices_, device));
   if (device::UsbDeviceFilter::MatchesAny(device, filters_) &&
       FindOriginInDescriptorSet(
           device->webusb_allowed_origins(),
           render_frame_host_->GetLastCommittedURL().GetOrigin())) {
@@ skipping 25 matching lines @@
         FindOriginInDescriptorSet(
             device->webusb_allowed_origins(),
             render_frame_host_->GetLastCommittedURL().GetOrigin())) {
       devices_.push_back(device);
       devices_names_.push_back(device->product_string());
     }
   }
   if (observer())
     observer()->OnOptionsInitialized();
 }
+
+void UsbChooserBubbleDelegate::set_bubble_controller(
+    BubbleReference bubble_controller) {
+  bubble_controller_ = bubble_controller;
+}