Remove Close button for chooser bubble and call CloseBubble when Cancel

chrome/browser/usb/usb_chooser_bubble_delegate.h

 // 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.
 
 #ifndef CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_
 #define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h"
+#include "components/bubble/bubble_reference.h"
 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
 #include "device/usb/usb_service.h"
 #include "mojo/public/cpp/bindings/array.h"
 
 namespace content {
 class RenderFrameHost;
 }
 
 namespace device {
 class UsbDevice;
@@ skipping 19 matching lines @@
   void Cancel() override;
   void Close() override;
 
   // device::UsbService::Observer:
   void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override;
   void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override;
 
   void GotUsbDeviceList(
       const std::vector<scoped_refptr<device::UsbDevice>>& devices);
 
+  void set_bubble_reference(BubbleReference bubble_reference);
+
  private:
   content::RenderFrameHost* const render_frame_host_;
   webusb::WebUsbPermissionBubble::GetPermissionCallback callback_;
   ScopedObserver<device::UsbService, device::UsbService::Observer>
       usb_service_observer_;
   std::vector<device::UsbDeviceFilter> filters_;
   std::vector<scoped_refptr<device::UsbDevice>> devices_;
   std::vector<base::string16> devices_names_;
+  BubbleReference bubble_reference_;

[felt, 2015/12/17 02:16:59]

nit: this is not a very descriptive name... could you give it something more
descriptive? maybe even bubble_controller_ which would describe what it is a bit
better

[juncai, 2015/12/17 17:57:20]

Done.

   base::WeakPtrFactory<UsbChooserBubbleDelegate> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleDelegate);
 };
 
 #endif  // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_