Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(640)

Unified Diff: chrome/browser/usb/usb_chooser_bubble_delegate.cc

Issue 1473393003: Add chooser permission UI code for Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wpu_1
Patch Set: updated code to calculate width for table column Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}

Powered by Google App Engine
This is Rietveld 408576698