Refactor ChooserBubbleController

chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h

Index: chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h
diff --git a/chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h b/chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h
index ccd28172295e7de009860df2dcdf2f078fa40cf3..4d9ed641893c3c5919807776cb268e3cb480a733 100644
--- a/chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h
+++ b/chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.h
@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "content/public/browser/bluetooth_chooser.h"
 
-class BluetoothChooserBubbleController;
+class BluetoothChooserController;
 
 // Represents a Bluetooth chooser to ask the user to select a Bluetooth
 // device from a list of options. This implementation is for desktop.
@@ -16,7 +16,7 @@ class BluetoothChooserBubbleController;
 class BluetoothChooserDesktop : public content::BluetoothChooser {
  public:
   explicit BluetoothChooserDesktop(
-      const content::BluetoothChooser::EventHandler& event_handler);
+      BluetoothChooserController* bluetooth_chooser_controller);
   ~BluetoothChooserDesktop() override;
 
   // BluetoothChooser:
@@ -26,18 +26,8 @@ class BluetoothChooserDesktop : public content::BluetoothChooser {
                  const base::string16& device_name) override;
   void RemoveDevice(const std::string& device_id) override;
 
-  void set_bluetooth_chooser_bubble_controller(
-      BluetoothChooserBubbleController* bluetooth_chooser_bubble_controller) {
-    bluetooth_chooser_bubble_controller_ = bluetooth_chooser_bubble_controller;
-  }
-
-  // Use this function to call event_handler_.
-  void CallEventHandler(content::BluetoothChooser::Event event,
-                        const std::string& device_id);
-
  private:
-  content::BluetoothChooser::EventHandler event_handler_;
-  BluetoothChooserBubbleController* bluetooth_chooser_bubble_controller_;
+  BluetoothChooserController* bluetooth_chooser_controller_;  // Weak.

[Reilly Grant (use Gerrit), 2016/05/26 00:56:53]

Please be more specific in this comment. Which object owns this pointer?

[juncai, 2016/05/26 18:13:39]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(BluetoothChooserDesktop);
 };