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

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

Issue 1742753002: Rename web_usb_permission_bubble.cc/h and webusb_permission_bubble.mojom (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 9 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 #ifndef CHROME_BROWSER_USB_USB_TAB_HELPER_H_ 5 #ifndef CHROME_BROWSER_USB_USB_TAB_HELPER_H_
6 #define CHROME_BROWSER_USB_USB_TAB_HELPER_H_ 6 #define CHROME_BROWSER_USB_USB_TAB_HELPER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "content/public/browser/web_contents_observer.h" 11 #include "content/public/browser/web_contents_observer.h"
12 #include "content/public/browser/web_contents_user_data.h" 12 #include "content/public/browser/web_contents_user_data.h"
13 #include "mojo/public/cpp/bindings/interface_request.h" 13 #include "mojo/public/cpp/bindings/interface_request.h"
14 14
15 namespace device { 15 namespace device {
16 namespace usb { 16 namespace usb {
17 class ChooserService;
17 class DeviceManager; 18 class DeviceManager;
18 class PermissionProvider; 19 class PermissionProvider;
19 } 20 }
20 } 21 }
21 22
22 namespace webusb {
23 class WebUsbPermissionBubble;
24 }
25
26 struct FrameUsbServices; 23 struct FrameUsbServices;
27 24
28 typedef std::map<content::RenderFrameHost*, scoped_ptr<FrameUsbServices>> 25 typedef std::map<content::RenderFrameHost*, scoped_ptr<FrameUsbServices>>
29 FrameUsbServicesMap; 26 FrameUsbServicesMap;
30 27
31 // Per-tab owner of USB services provided to render frames within that tab. 28 // Per-tab owner of USB services provided to render frames within that tab.
32 class UsbTabHelper : public content::WebContentsObserver, 29 class UsbTabHelper : public content::WebContentsObserver,
33 public content::WebContentsUserData<UsbTabHelper> { 30 public content::WebContentsUserData<UsbTabHelper> {
34 public: 31 public:
35 static UsbTabHelper* GetOrCreateForWebContents( 32 static UsbTabHelper* GetOrCreateForWebContents(
36 content::WebContents* web_contents); 33 content::WebContents* web_contents);
37 34
38 ~UsbTabHelper() override; 35 ~UsbTabHelper() override;
39 36
40 void CreateDeviceManager( 37 void CreateDeviceManager(
41 content::RenderFrameHost* render_frame_host, 38 content::RenderFrameHost* render_frame_host,
42 mojo::InterfaceRequest<device::usb::DeviceManager> request); 39 mojo::InterfaceRequest<device::usb::DeviceManager> request);
43 40
44 #if !defined(OS_ANDROID) 41 #if !defined(OS_ANDROID)
45 void CreatePermissionBubble( 42 void CreateChooserService(
46 content::RenderFrameHost* render_frame_host, 43 content::RenderFrameHost* render_frame_host,
47 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); 44 mojo::InterfaceRequest<device::usb::ChooserService> request);
48 #endif // !defined(OS_ANDROID) 45 #endif // !defined(OS_ANDROID)
49 46
50 private: 47 private:
51 explicit UsbTabHelper(content::WebContents* web_contents); 48 explicit UsbTabHelper(content::WebContents* web_contents);
52 friend class content::WebContentsUserData<UsbTabHelper>; 49 friend class content::WebContentsUserData<UsbTabHelper>;
53 50
54 // content::WebContentsObserver overrides: 51 // content::WebContentsObserver overrides:
55 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; 52 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
56 53
57 FrameUsbServices* GetFrameUsbService( 54 FrameUsbServices* GetFrameUsbService(
58 content::RenderFrameHost* render_frame_host); 55 content::RenderFrameHost* render_frame_host);
59 56
60 base::WeakPtr<device::usb::PermissionProvider> GetPermissionProvider( 57 base::WeakPtr<device::usb::PermissionProvider> GetPermissionProvider(
61 content::RenderFrameHost* render_frame_host); 58 content::RenderFrameHost* render_frame_host);
62 59
63 #if !defined(OS_ANDROID) 60 #if !defined(OS_ANDROID)
64 void GetPermissionBubble( 61 void GetChooserService(
65 content::RenderFrameHost* render_frame_host, 62 content::RenderFrameHost* render_frame_host,
66 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); 63 mojo::InterfaceRequest<device::usb::ChooserService> request);
67 #endif // !defined(OS_ANDROID) 64 #endif // !defined(OS_ANDROID)
68 65
69 FrameUsbServicesMap frame_usb_services_; 66 FrameUsbServicesMap frame_usb_services_;
70 67
71 DISALLOW_COPY_AND_ASSIGN(UsbTabHelper); 68 DISALLOW_COPY_AND_ASSIGN(UsbTabHelper);
72 }; 69 };
73 70
74 #endif // CHROME_BROWSER_USB_USB_TAB_HELPER_H_ 71 #endif // CHROME_BROWSER_USB_USB_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_bubble_controller.cc ('k') | chrome/browser/usb/usb_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698