Refactor ChooserBubbleController

chrome/browser/usb/usb_chooser_bubble_controller.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_controller.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 87 matching lines @@
   RecordWebUsbChooserClosure(devices_.size() == 0
                                  ? WEBUSB_CHOOSER_CLOSED_CANCELLED_NO_DEVICES
                                  : WEBUSB_CHOOSER_CLOSED_CANCELLED);
 
   if (bubble_reference_)
     bubble_reference_->CloseBubble(BUBBLE_CLOSE_CANCELED);
 }
 
 void UsbChooserBubbleController::Close() {}
 
+GURL UsbChooserBubbleController::GetHelpCenterUrl() const {
+  return GURL(chrome::kChooserUsbOverviewURL);
+}
+
 void UsbChooserBubbleController::OnDeviceAdded(
     scoped_refptr<device::UsbDevice> device) {
   if (DisplayDevice(device)) {
     devices_.push_back(std::make_pair(device, device->product_string()));
     if (observer())
       observer()->OnOptionAdded(devices_.size() - 1);
   }
 }
 
-GURL UsbChooserBubbleController::GetHelpCenterUrl() const {
-  return GURL(chrome::kChooserUsbOverviewURL);
-}
-
 void UsbChooserBubbleController::OnDeviceRemoved(
     scoped_refptr<device::UsbDevice> device) {
   for (auto it = devices_.begin(); it != devices_.end(); ++it) {
     if (it->first == device) {
       size_t index = it - devices_.begin();
       devices_.erase(it);
       if (observer())
         observer()->OnOptionRemoved(index);
       return;
     }
@@ skipping 19 matching lines @@
 
 bool UsbChooserBubbleController::DisplayDevice(
     scoped_refptr<device::UsbDevice> device) const {
   return device::UsbDeviceFilter::MatchesAny(device, filters_) &&
          (base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kDisableWebUsbSecurity) ||
           device::FindInWebUsbAllowedOrigins(
               device->webusb_allowed_origins(),
               render_frame_host_->GetLastCommittedURL().GetOrigin()));
 }