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

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: merged changes from upstream, address reillyg@'s comments 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 ee2d4471f4cd26a0883cdef61ae619dd605175e5..8beeb1fd15fb50c375869f551663a287ccb0ac58 100644
--- a/chrome/browser/usb/usb_chooser_bubble_delegate.cc
+++ b/chrome/browser/usb/usb_chooser_bubble_delegate.cc
@@ -17,12 +17,6 @@
#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.
@@ -54,12 +48,12 @@ UsbChooserBubbleDelegate::UsbChooserBubbleDelegate(
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 th
juncai 2015/12/09 23:13:56 Done.
device::UsbService* usb_service =
device::DeviceClient::Get()->GetUsbService();
if (!usb_service)
@@ -80,16 +74,6 @@ UsbChooserBubbleDelegate::~UsbChooserBubbleDelegate() {
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_;

Powered by Google App Engine
This is Rietveld 408576698