OLD | NEW |
---|---|
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/web_usb_permission_bubble.h" | 5 #include "chrome/browser/usb/web_usb_permission_bubble.h" |
6 | 6 |
7 #include "chrome/browser/ui/browser_finder.h" | 7 #include "chrome/browser/ui/browser_finder.h" |
8 #include "chrome/browser/ui/chrome_bubble_manager.h" | 8 #include "chrome/browser/ui/chrome_bubble_manager.h" |
9 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h" | 9 #include "chrome/browser/usb/usb_chooser_bubble_delegate.h" |
10 #include "components/bubble/bubble_controller.h" | 10 #include "components/bubble/bubble_controller.h" |
(...skipping 13 matching lines...) Expand all Loading... | |
24 bubble->CloseBubble(BUBBLE_CLOSE_FORCED); | 24 bubble->CloseBubble(BUBBLE_CLOSE_FORCED); |
25 } | 25 } |
26 } | 26 } |
27 | 27 |
28 void ChromeWebUsbPermissionBubble::GetPermission( | 28 void ChromeWebUsbPermissionBubble::GetPermission( |
29 mojo::Array<device::usb::DeviceFilterPtr> device_filters, | 29 mojo::Array<device::usb::DeviceFilterPtr> device_filters, |
30 const GetPermissionCallback& callback) { | 30 const GetPermissionCallback& callback) { |
31 content::WebContents* web_contents = | 31 content::WebContents* web_contents = |
32 content::WebContents::FromRenderFrameHost(render_frame_host_); | 32 content::WebContents::FromRenderFrameHost(render_frame_host_); |
33 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); | 33 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); |
34 scoped_ptr<BubbleDelegate> bubble_delegate(new UsbChooserBubbleDelegate( | 34 scoped_ptr<UsbChooserBubbleDelegate> bubble_delegate( |
35 browser, device_filters.Pass(), render_frame_host_, callback)); | 35 new UsbChooserBubbleDelegate(browser, device_filters.Pass(), |
Ken Rockot(use gerrit already)
2015/12/15 06:24:05
nit: since you're changing this code, please migra
juncai
2015/12/15 17:23:39
Done.
| |
36 render_frame_host_, callback)); | |
37 UsbChooserBubbleDelegate* bubble_delegate_ptr = bubble_delegate.get(); | |
36 BubbleReference bubble_reference = | 38 BubbleReference bubble_reference = |
37 browser->GetBubbleManager()->ShowBubble(bubble_delegate.Pass()); | 39 browser->GetBubbleManager()->ShowBubble(bubble_delegate.Pass()); |
40 bubble_delegate_ptr->set_bubble_reference(bubble_reference); | |
38 bubbles_.push_back(bubble_reference); | 41 bubbles_.push_back(bubble_reference); |
39 } | 42 } |
40 | 43 |
41 void ChromeWebUsbPermissionBubble::Bind( | 44 void ChromeWebUsbPermissionBubble::Bind( |
42 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 45 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { |
43 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 46 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
44 bindings_.AddBinding(this, request.Pass()); | 47 bindings_.AddBinding(this, request.Pass()); |
45 } | 48 } |
OLD | NEW |