Add chooser permission UI code for Mac

chrome/browser/usb/usb_chooser_bubble_delegate.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_delegate.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "device/core/device_client.h"
 #include "device/devices_app/usb/type_converters.h"
 #include "device/usb/usb_device.h"
 #include "device/usb/usb_device_filter.h"
 #include "url/gurl.h"
 
-#if defined(OS_MACOSX)
-#include "components/bubble/bubble_ui.h"
-#else
-#include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h"
-#endif
-
 namespace {
 
 // Check if the origin is in the description set.
 bool FindOriginInDescriptorSet(const device::WebUsbDescriptorSet* set,
                                const GURL& origin) {
   if (!set)
     return false;
 
   if (ContainsValue(set->origins, origin))
     return true;
@@ skipping 11 matching lines @@
   return false;
 }
 
 }  // namespace
 
 UsbChooserBubbleDelegate::UsbChooserBubbleDelegate(
     Browser* browser,
     mojo::Array<device::usb::DeviceFilterPtr> device_filters,
     content::RenderFrameHost* render_frame_host,
     const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback)
-    : browser_(browser),
+    : ChooserBubbleDelegate(browser),
       render_frame_host_(render_frame_host),
       callback_(callback),
       usb_service_observer_(this),
       weak_factory_(this) {
-  DCHECK(browser_);
+  DCHECK(browser);

[Reilly Grant (use Gerrit), 2015/12/09 18:56:41]

nit: This DCHECK isn't really necessary because the parent class does it too and
this constructor doesn't access |browser|.

[juncai, 2015/12/09 23:13:56]

Done.

   device::UsbService* usb_service =
       device::DeviceClient::Get()->GetUsbService();
   if (!usb_service)
     return;
 
   if (!usb_service_observer_.IsObserving(usb_service))
     usb_service_observer_.Add(usb_service);
 
   if (!device_filters.is_null())
     filters_ = device_filters.To<std::vector<device::UsbDeviceFilter>>();
 
   usb_service->GetDevices(base::Bind(
       &UsbChooserBubbleDelegate::GotUsbDeviceList, weak_factory_.GetWeakPtr()));
 }
 
 UsbChooserBubbleDelegate::~UsbChooserBubbleDelegate() {
   if (!callback_.is_null())
     callback_.Run(nullptr);
 }
 
-scoped_ptr<BubbleUi> UsbChooserBubbleDelegate::BuildBubbleUi() {
-  scoped_ptr<BubbleUi> bubble_ui;
-// TODO(juncai): Add chooser bubble ui cocoa code for Mac.
-// Please refer to http://crbug.com/492204 for more information.
-#if !defined(OS_MACOSX)
-  bubble_ui.reset(new ChooserBubbleUiView(browser_, this));
-#endif
-  return bubble_ui.Pass();
-}
-
 const std::vector<base::string16>& UsbChooserBubbleDelegate::GetOptions()
     const {
   return devices_names_;
 }
 
 void UsbChooserBubbleDelegate::Select(int index) {
   size_t idx = static_cast<size_t>(index);
   size_t num_options = devices_.size();
   DCHECK_LT(idx, num_options);
   if (idx < num_options) {
@@ skipping 57 matching lines @@
         FindOriginInDescriptorSet(
             device->webusb_allowed_origins(),
             render_frame_host_->GetLastCommittedURL().GetOrigin())) {
       devices_.push_back(device);
       devices_names_.push_back(device->product_string());
     }
   }
   if (observer())
     observer()->OnOptionsInitialized();
 }