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 5887773132a63cda714b319c3a2d662346c770ca..7411308a8e0ed99772c1fcec7baeb81441366f72 100644 |
--- a/chrome/browser/usb/usb_chooser_bubble_delegate.cc |
+++ b/chrome/browser/usb/usb_chooser_bubble_delegate.cc |
@@ -4,11 +4,6 @@ |
#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( |
@@ -16,25 +11,13 @@ UsbChooserBubbleDelegate::UsbChooserBubbleDelegate( |
mojo::Array<device::usb::DeviceFilterPtr> device_filters, |
content::RenderFrameHost* render_frame_host, |
const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback) |
- : browser_(browser) { |
- DCHECK(browser_); |
+ : ChooserBubbleDelegate(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; |
-// 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_, chooser_options_.get(), this)); |
-#endif |
- return bubble_ui.Pass(); |
-} |
- |
void UsbChooserBubbleDelegate::Select(int index) { |
chooser_options_->Select(index); |
} |