Refactor ChooserBubbleController

chrome/browser/usb/usb_chooser_controller.h

Index: chrome/browser/usb/usb_chooser_controller.h
diff --git a/chrome/browser/usb/usb_chooser_bubble_controller.h b/chrome/browser/usb/usb_chooser_controller.h
similarity index 66%
rename from chrome/browser/usb/usb_chooser_bubble_controller.h
rename to chrome/browser/usb/usb_chooser_controller.h
index c4cc1f29d59d66054c935c6bcee605365b3d49c8..b92701a4b0a7e2d9c98a2da7c4b4f5bfeb20518c 100644
--- a/chrome/browser/usb/usb_chooser_bubble_controller.h
+++ b/chrome/browser/usb/usb_chooser_controller.h
@@ -2,8 +2,8 @@
 // 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_CONTROLLER_H_
-#define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
+#ifndef CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
+#define CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
 
 #include <utility>
 #include <vector>
@@ -12,8 +12,7 @@
 #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_controller.h"
-#include "components/bubble/bubble_reference.h"
+#include "components/chooser_controller/chooser_controller.h"
 #include "device/usb/public/interfaces/chooser_service.mojom.h"
 #include "device/usb/usb_service.h"
 #include "mojo/public/cpp/bindings/array.h"
@@ -27,31 +26,30 @@ class UsbDevice;
 class UsbDeviceFilter;
 }
 
-// UsbChooserBubbleController creates a chooser bubble for WebUsb.
-class UsbChooserBubbleController : public ChooserBubbleController,
-                                   public device::UsbService::Observer {
+// UsbChooserController creates a chooser for WebUSB.
+// It is owned by ChooserBubbleDelegate.
+class UsbChooserController : public ChooserController,
+                             public device::UsbService::Observer {
  public:
-  UsbChooserBubbleController(
+  UsbChooserController(
       content::RenderFrameHost* owner,
       mojo::Array<device::usb::DeviceFilterPtr> device_filters,
       content::RenderFrameHost* render_frame_host,
       const device::usb::ChooserService::GetPermissionCallback& callback);
-  ~UsbChooserBubbleController() override;
+  ~UsbChooserController() override;
 
-  // ChooserBubbleController:
+  // ChooserController:
   size_t NumOptions() const override;
   const base::string16& GetOption(size_t index) const override;
   void Select(size_t index) override;
   void Cancel() override;
   void Close() override;
-  GURL GetHelpCenterUrl() const override;
+  void OpenHelpCenterUrl() const override;
 
   // device::UsbService::Observer:
   void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override;
   void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override;
 
-  void set_bubble_reference(BubbleReference bubble_reference);
-
  private:
   void GotUsbDeviceList(
       const std::vector<scoped_refptr<device::UsbDevice>>& devices);
@@ -65,10 +63,9 @@ class UsbChooserBubbleController : public ChooserBubbleController,
   // Each pair is a (device, device name).
   std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
       devices_;
-  BubbleReference bubble_reference_;
-  base::WeakPtrFactory<UsbChooserBubbleController> weak_factory_;
+  base::WeakPtrFactory<UsbChooserController> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleController);
+  DISALLOW_COPY_AND_ASSIGN(UsbChooserController);
 };
 
-#endif  // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
+#endif  // CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_