Change ChooserBubbleDelegate class name to ChooserBubbleController

This patch changed ChooserBubbleDelegate class name to
ChooserBubbleController since it better reflects the class's
responsibilities and clarifies the roles of the class.

BUG=492204, 588933

Review URL: https://codereview.chromium.org/1724183005

Cr-Commit-Position: refs/heads/master@{#377989}

3 files changed, 48 insertions, 46 deletions

diff --git a/chrome/browser/usb/usb_chooser_bubble_delegate.cc b/chrome/browser/usb/usb_chooser_bubble_controller.cc
index 026641d..b4cce8f 100644
--- a/chrome/browser/usb/usb_chooser_bubble_delegate.cc
+++ b/chrome/browser/usb/usb_chooser_bubble_controller.cc
@@ -2,7 +2,7 @@
 // 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 "chrome/browser/usb/usb_chooser_bubble_controller.h"
 
 #include <stddef.h>
 #include <utility>
@@ -73,12 +73,12 @@ bool FindInAllowedOrigins(const device::WebUsbAllowedOrigins* allowed_origins,
 
 }  // namespace
 
-UsbChooserBubbleDelegate::UsbChooserBubbleDelegate(
+UsbChooserBubbleController::UsbChooserBubbleController(
     content::RenderFrameHost* owner,
     mojo::Array<device::usb::DeviceFilterPtr> device_filters,
     content::RenderFrameHost* render_frame_host,
     const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback)
-    : ChooserBubbleDelegate(owner),
+    : ChooserBubbleController(owner),
       render_frame_host_(render_frame_host),
       callback_(callback),
       usb_service_observer_(this),
@@ -94,25 +94,27 @@ UsbChooserBubbleDelegate::UsbChooserBubbleDelegate(
   if (!device_filters.is_null())
     filters_ = device_filters.To<std::vector<device::UsbDeviceFilter>>();
 
-  usb_service->GetDevices(base::Bind(
-      &UsbChooserBubbleDelegate::GotUsbDeviceList, weak_factory_.GetWeakPtr()));
+  usb_service->GetDevices(
+      base::Bind(&UsbChooserBubbleController::GotUsbDeviceList,
+                 weak_factory_.GetWeakPtr()));
 }
 
-UsbChooserBubbleDelegate::~UsbChooserBubbleDelegate() {
+UsbChooserBubbleController::~UsbChooserBubbleController() {
   if (!callback_.is_null())
     callback_.Run(nullptr);
 }
 
-size_t UsbChooserBubbleDelegate::NumOptions() const {
+size_t UsbChooserBubbleController::NumOptions() const {
   return devices_.size();
 }
 
-const base::string16& UsbChooserBubbleDelegate::GetOption(size_t index) const {
+const base::string16& UsbChooserBubbleController::GetOption(
+    size_t index) const {
   DCHECK_LT(index, devices_.size());
   return devices_[index].second;
 }
 
-void UsbChooserBubbleDelegate::Select(size_t index) {
+void UsbChooserBubbleController::Select(size_t index) {
   DCHECK_LT(index, devices_.size());
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host_);
@@ -135,22 +137,22 @@ void UsbChooserBubbleDelegate::Select(size_t index) {
                            ? WEBUSB_CHOOSER_CLOSED_EPHEMERAL_PERMISSION_GRANTED
                            : WEBUSB_CHOOSER_CLOSED_PERMISSION_GRANTED);
 
-  if (bubble_controller_)
-    bubble_controller_->CloseBubble(BUBBLE_CLOSE_ACCEPTED);
+  if (bubble_reference_)
+    bubble_reference_->CloseBubble(BUBBLE_CLOSE_ACCEPTED);
 }
 
-void UsbChooserBubbleDelegate::Cancel() {
+void UsbChooserBubbleController::Cancel() {
   RecordChooserClosure(devices_.size() == 0
                            ? WEBUSB_CHOOSER_CLOSED_CANCELLED_NO_DEVICES
                            : WEBUSB_CHOOSER_CLOSED_CANCELLED);
 
-  if (bubble_controller_)
-    bubble_controller_->CloseBubble(BUBBLE_CLOSE_CANCELED);
+  if (bubble_reference_)
+    bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED);
 }
 
-void UsbChooserBubbleDelegate::Close() {}
+void UsbChooserBubbleController::Close() {}
 
-void UsbChooserBubbleDelegate::OnDeviceAdded(
+void UsbChooserBubbleController::OnDeviceAdded(
     scoped_refptr<device::UsbDevice> device) {
   if (device::UsbDeviceFilter::MatchesAny(device, filters_) &&
       FindInAllowedOrigins(
@@ -162,11 +164,11 @@ void UsbChooserBubbleDelegate::OnDeviceAdded(
   }
 }
 
-GURL UsbChooserBubbleDelegate::GetHelpCenterUrl() const {
+GURL UsbChooserBubbleController::GetHelpCenterUrl() const {
   return GURL(chrome::kChooserUsbOverviewURL);
 }
 
-void UsbChooserBubbleDelegate::OnDeviceRemoved(
+void UsbChooserBubbleController::OnDeviceRemoved(
     scoped_refptr<device::UsbDevice> device) {
   for (auto it = devices_.begin(); it != devices_.end(); ++it) {
     if (it->first == device) {
@@ -181,7 +183,7 @@ void UsbChooserBubbleDelegate::OnDeviceRemoved(
 
 // Get a list of devices that can be shown in the chooser bubble UI for
 // user to grant permsssion.
-void UsbChooserBubbleDelegate::GotUsbDeviceList(
+void UsbChooserBubbleController::GotUsbDeviceList(
     const std::vector<scoped_refptr<device::UsbDevice>>& devices) {
   for (const auto& device : devices) {
     if (device::UsbDeviceFilter::MatchesAny(device, filters_) &&
@@ -195,7 +197,7 @@ void UsbChooserBubbleDelegate::GotUsbDeviceList(
     observer()->OnOptionsInitialized();
 }
 
-void UsbChooserBubbleDelegate::set_bubble_controller(
-    BubbleReference bubble_controller) {
-  bubble_controller_ = bubble_controller;
+void UsbChooserBubbleController::set_bubble_reference(
+    BubbleReference bubble_reference) {
+  bubble_reference_ = bubble_reference;
 }
diff --git a/chrome/browser/usb/usb_chooser_bubble_delegate.h b/chrome/browser/usb/usb_chooser_bubble_controller.h
index 4921b0f..6de8fb0 100644
--- a/chrome/browser/usb/usb_chooser_bubble_delegate.h
+++ b/chrome/browser/usb/usb_chooser_bubble_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_DELEGATE_H_
-#define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_
+#ifndef CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
+#define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
 
 #include <utility>
 
@@ -11,7 +11,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_delegate.h"
+#include "chrome/browser/ui/website_settings/chooser_bubble_controller.h"
 #include "components/bubble/bubble_reference.h"
 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
 #include "device/usb/usb_service.h"
@@ -26,18 +26,18 @@ class UsbDevice;
 class UsbDeviceFilter;
 }
 
-// UsbChooserBubbleDelegate creates a chooser bubble for WebUsb.
-class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,
-                                 public device::UsbService::Observer {
+// UsbChooserBubbleController creates a chooser bubble for WebUsb.
+class UsbChooserBubbleController : public ChooserBubbleController,
+                                   public device::UsbService::Observer {
  public:
-  UsbChooserBubbleDelegate(
+  UsbChooserBubbleController(
       content::RenderFrameHost* owner,
       mojo::Array<device::usb::DeviceFilterPtr> device_filters,
       content::RenderFrameHost* render_frame_host,
       const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback);
-  ~UsbChooserBubbleDelegate() override;
+  ~UsbChooserBubbleController() override;
 
-  // ChooserBubbleDelegate:
+  // ChooserBubbleController:
   size_t NumOptions() const override;
   const base::string16& GetOption(size_t index) const override;
   void Select(size_t index) override;
@@ -52,7 +52,7 @@ class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,
   void GotUsbDeviceList(
       const std::vector<scoped_refptr<device::UsbDevice>>& devices);
 
-  void set_bubble_controller(BubbleReference bubble_controller);
+  void set_bubble_reference(BubbleReference bubble_reference);
 
  private:
   content::RenderFrameHost* const render_frame_host_;
@@ -63,10 +63,10 @@ class UsbChooserBubbleDelegate : public ChooserBubbleDelegate,
   // Each pair is a (device, device name).
   std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
       devices_;
-  BubbleReference bubble_controller_;
-  base::WeakPtrFactory<UsbChooserBubbleDelegate> weak_factory_;
+  BubbleReference bubble_reference_;
+  base::WeakPtrFactory<UsbChooserBubbleController> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleDelegate);
+  DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleController);
 };
 
-#endif  // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_
+#endif  // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
diff --git a/chrome/browser/usb/web_usb_permission_bubble.cc b/chrome/browser/usb/web_usb_permission_bubble.cc
index 6ba7d26..8b6b7d1 100644
--- a/chrome/browser/usb/web_usb_permission_bubble.cc
+++ b/chrome/browser/usb/web_usb_permission_bubble.cc
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/chrome_bubble_manager.h"
-#include "chrome/browser/usb/usb_chooser_bubble_delegate.h"
+#include "chrome/browser/usb/usb_chooser_bubble_controller.h"
 #include "components/bubble/bubble_controller.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_frame_host.h"
@@ -33,15 +33,15 @@ void ChromeWebUsbPermissionBubble::GetPermission(
   content::WebContents* web_contents =
       content::WebContents::FromRenderFrameHost(render_frame_host_);
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
-  scoped_ptr<UsbChooserBubbleDelegate> bubble_delegate(
-      new UsbChooserBubbleDelegate(render_frame_host_,
-                                   std::move(device_filters),
-                                   render_frame_host_, callback));
-  UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get();
-  BubbleReference bubble_controller =
-      browser->GetBubbleManager()->ShowBubble(std::move(bubble_delegate));
-  bubble_delegate_ptr->set_bubble_controller(bubble_controller);
-  bubbles_.push_back(bubble_controller);
+  scoped_ptr<UsbChooserBubbleController> bubble_controller(
+      new UsbChooserBubbleController(render_frame_host_,
+                                     std::move(device_filters),
+                                     render_frame_host_, callback));
+  UsbChooserBubbleController* bubble_controller_ptr = bubble_controller.get();
+  BubbleReference bubble_reference =
+      browser->GetBubbleManager()->ShowBubble(std::move(bubble_controller));
+  bubble_controller_ptr->set_bubble_reference(bubble_reference);
+  bubbles_.push_back(bubble_reference);
 }
 
 void ChromeWebUsbPermissionBubble::Bind(