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

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

Issue 1682363002: Remove //device/devices_app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove two files that somehow survived in //device/devices_app. Created 4 years, 10 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/usb_tab_helper.h" 5 #include "chrome/browser/usb/usb_tab_helper.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/usb/web_usb_permission_bubble.h" 10 #include "chrome/browser/usb/web_usb_permission_bubble.h"
11 #include "chrome/browser/usb/web_usb_permission_provider.h" 11 #include "chrome/browser/usb/web_usb_permission_provider.h"
12 #include "device/devices_app/usb/device_manager_impl.h" 12 #include "device/usb/mojo/device_manager_impl.h"
13 13
14 using content::RenderFrameHost; 14 using content::RenderFrameHost;
15 using content::WebContents; 15 using content::WebContents;
16 16
17 DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper); 17 DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper);
18 18
19 struct FrameUsbServices { 19 struct FrameUsbServices {
20 scoped_ptr<WebUSBPermissionProvider> permission_provider; 20 scoped_ptr<WebUSBPermissionProvider> permission_provider;
21 scoped_ptr<ChromeWebUsbPermissionBubble> permission_bubble; 21 scoped_ptr<ChromeWebUsbPermissionBubble> permission_bubble;
22 }; 22 };
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 void UsbTabHelper::GetPermissionBubble( 85 void UsbTabHelper::GetPermissionBubble(
86 content::RenderFrameHost* render_frame_host, 86 content::RenderFrameHost* render_frame_host,
87 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { 87 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host); 88 FrameUsbServices* frame_usb_services = GetFrameUsbService(render_frame_host);
89 if (!frame_usb_services->permission_bubble) { 89 if (!frame_usb_services->permission_bubble) {
90 frame_usb_services->permission_bubble.reset( 90 frame_usb_services->permission_bubble.reset(
91 new ChromeWebUsbPermissionBubble(render_frame_host)); 91 new ChromeWebUsbPermissionBubble(render_frame_host));
92 } 92 }
93 frame_usb_services->permission_bubble->Bind(std::move(request)); 93 frame_usb_services->permission_bubble->Bind(std::move(request));
94 } 94 }
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_delegate.cc ('k') | chrome/browser/usb/web_usb_permission_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698