| Index: chrome/browser/usb/usb_chooser_bubble_delegate.cc
|
| diff --git a/chrome/browser/usb/usb_chooser_bubble_delegate.cc b/chrome/browser/usb/usb_chooser_bubble_delegate.cc
|
| index be536adbbe4b00ab1e6ea863b7462b2fa3314b8b..f38919946022b1bab8ed99406d7bc2d65f1db2db 100644
|
| --- a/chrome/browser/usb/usb_chooser_bubble_delegate.cc
|
| +++ b/chrome/browser/usb/usb_chooser_bubble_delegate.cc
|
| @@ -4,35 +4,21 @@
|
|
|
| #include "chrome/browser/usb/usb_chooser_bubble_delegate.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
|
| #include "chrome/browser/usb/usb_chooser_options.h"
|
|
|
| UsbChooserBubbleDelegate::UsbChooserBubbleDelegate(
|
| Browser* browser,
|
| mojo::Array<device::usb::DeviceFilterPtr> device_filters,
|
| content::RenderFrameHost* render_frame_host,
|
| - const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback)
|
| - : browser_(browser) {
|
| - DCHECK(browser_);
|
| + const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback) {
|
| + DCHECK(browser);
|
| + browser_ = browser;
|
| chooser_options_.reset(new UsbChooserOptions(device_filters.Pass(),
|
| render_frame_host, callback));
|
| }
|
|
|
| UsbChooserBubbleDelegate::~UsbChooserBubbleDelegate() {}
|
|
|
| -scoped_ptr<BubbleUi> UsbChooserBubbleDelegate::BuildBubbleUi() {
|
| - scoped_ptr<BubbleUi> bubble_ui;
|
| -#if !defined(OS_MACOSX)
|
| - bubble_ui.reset(
|
| - new ChooserBubbleUiView(browser_, chooser_options_.get(), this));
|
| -#endif
|
| - return bubble_ui.Pass();
|
| -}
|
| -
|
| void UsbChooserBubbleDelegate::Select(int index) {
|
| chooser_options_->Select(index);
|
| }
|
|
|