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

Side by Side 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 master to fix merge conflicts 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h" 5 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h"
6 6
7 #if defined(OS_MACOSX)
8 #include "components/bubble/bubble_ui.h"
9 #else
10 #include "chrome/browser/ui/views/website_settings/chooser_bubble_ui_view.h"
11 #endif
12 #include "chrome/browser/usb/usb_chooser_options.h" 7 #include "chrome/browser/usb/usb_chooser_options.h"
13 8
14 UsbChooserBubbleDelegate::UsbChooserBubbleDelegate( 9 UsbChooserBubbleDelegate::UsbChooserBubbleDelegate(
15 Browser* browser, 10 Browser* browser,
16 mojo::Array<device::usb::DeviceFilterPtr> device_filters, 11 mojo::Array<device::usb::DeviceFilterPtr> device_filters,
17 content::RenderFrameHost* render_frame_host, 12 content::RenderFrameHost* render_frame_host,
18 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback) 13 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback) {
19 : browser_(browser) { 14 DCHECK(browser);
20 DCHECK(browser_); 15 browser_ = browser;
21 chooser_options_.reset(new UsbChooserOptions(device_filters.Pass(), 16 chooser_options_.reset(new UsbChooserOptions(device_filters.Pass(),
22 render_frame_host, callback)); 17 render_frame_host, callback));
23 } 18 }
24 19
25 UsbChooserBubbleDelegate::~UsbChooserBubbleDelegate() {} 20 UsbChooserBubbleDelegate::~UsbChooserBubbleDelegate() {}
26 21
27 scoped_ptr<BubbleUi> UsbChooserBubbleDelegate::BuildBubbleUi() {
28 scoped_ptr<BubbleUi> bubble_ui;
29 #if !defined(OS_MACOSX)
30 bubble_ui.reset(
31 new ChooserBubbleUiView(browser_, chooser_options_.get(), this));
32 #endif
33 return bubble_ui.Pass();
34 }
35
36 void UsbChooserBubbleDelegate::Select(int index) { 22 void UsbChooserBubbleDelegate::Select(int index) {
37 chooser_options_->Select(index); 23 chooser_options_->Select(index);
38 } 24 }
39 25
40 void UsbChooserBubbleDelegate::Cancel() {} 26 void UsbChooserBubbleDelegate::Cancel() {}
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698