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

Side by Side Diff: chrome/browser/usb/web_usb_chooser_service.cc

Issue 2234443002: Mojo C++ binding: make device/usb mojom targets use STD string/vector types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move the vector converter into a private header. Created 4 years, 4 months 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/web_usb_chooser_service.h" 5 #include "chrome/browser/usb/web_usb_chooser_service.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "chrome/browser/ui/browser_finder.h" 9 #include "chrome/browser/ui/browser_finder.h"
10 #include "chrome/browser/ui/chrome_bubble_manager.h" 10 #include "chrome/browser/ui/chrome_bubble_manager.h"
(...skipping 11 matching lines...) Expand all
22 } 22 }
23 23
24 WebUsbChooserService::~WebUsbChooserService() { 24 WebUsbChooserService::~WebUsbChooserService() {
25 for (const auto& bubble : bubbles_) { 25 for (const auto& bubble : bubbles_) {
26 if (bubble) 26 if (bubble)
27 bubble->CloseBubble(BUBBLE_CLOSE_FORCED); 27 bubble->CloseBubble(BUBBLE_CLOSE_FORCED);
28 } 28 }
29 } 29 }
30 30
31 void WebUsbChooserService::GetPermission( 31 void WebUsbChooserService::GetPermission(
32 mojo::Array<device::usb::DeviceFilterPtr> device_filters, 32 std::vector<device::usb::DeviceFilterPtr> device_filters,
33 const GetPermissionCallback& callback) { 33 const GetPermissionCallback& callback) {
34 content::WebContents* web_contents = 34 content::WebContents* web_contents =
35 content::WebContents::FromRenderFrameHost(render_frame_host_); 35 content::WebContents::FromRenderFrameHost(render_frame_host_);
36 Browser* browser = chrome::FindBrowserWithWebContents(web_contents); 36 Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
37 std::unique_ptr<UsbChooserController> usb_chooser_controller( 37 std::unique_ptr<UsbChooserController> usb_chooser_controller(
38 new UsbChooserController(render_frame_host_, std::move(device_filters), 38 new UsbChooserController(render_frame_host_, std::move(device_filters),
39 render_frame_host_, callback)); 39 render_frame_host_, callback));
40 std::unique_ptr<ChooserBubbleDelegate> chooser_bubble_delegate( 40 std::unique_ptr<ChooserBubbleDelegate> chooser_bubble_delegate(
41 new ChooserBubbleDelegate(render_frame_host_, 41 new ChooserBubbleDelegate(render_frame_host_,
42 std::move(usb_chooser_controller))); 42 std::move(usb_chooser_controller)));
43 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble( 43 BubbleReference bubble_reference = browser->GetBubbleManager()->ShowBubble(
44 std::move(chooser_bubble_delegate)); 44 std::move(chooser_bubble_delegate));
45 bubbles_.push_back(bubble_reference); 45 bubbles_.push_back(bubble_reference);
46 } 46 }
47 47
48 void WebUsbChooserService::Bind( 48 void WebUsbChooserService::Bind(
49 mojo::InterfaceRequest<device::usb::ChooserService> request) { 49 mojo::InterfaceRequest<device::usb::ChooserService> request) {
50 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); 50 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
51 bindings_.AddBinding(this, std::move(request)); 51 bindings_.AddBinding(this, std::move(request));
52 } 52 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698