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

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

Issue 1684043002: Fix build failure of chrome_public_apk on Android GN build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +#endif comment 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
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/usb/usb_tab_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
(...skipping 23 matching lines...) Expand all
34 public: 34 public:
35 static UsbTabHelper* GetOrCreateForWebContents( 35 static UsbTabHelper* GetOrCreateForWebContents(
36 content::WebContents* web_contents); 36 content::WebContents* web_contents);
37 37
38 ~UsbTabHelper() override; 38 ~UsbTabHelper() override;
39 39
40 void CreateDeviceManager( 40 void CreateDeviceManager(
41 content::RenderFrameHost* render_frame_host, 41 content::RenderFrameHost* render_frame_host,
42 mojo::InterfaceRequest<device::usb::DeviceManager> request); 42 mojo::InterfaceRequest<device::usb::DeviceManager> request);
43 43
44 #if !defined(OS_ANDROID)
44 void CreatePermissionBubble( 45 void CreatePermissionBubble(
45 content::RenderFrameHost* render_frame_host, 46 content::RenderFrameHost* render_frame_host,
46 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); 47 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request);
48 #endif // !defined(OS_ANDROID)
47 49
48 private: 50 private:
49 explicit UsbTabHelper(content::WebContents* web_contents); 51 explicit UsbTabHelper(content::WebContents* web_contents);
50 friend class content::WebContentsUserData<UsbTabHelper>; 52 friend class content::WebContentsUserData<UsbTabHelper>;
51 53
52 // content::WebContentsObserver overrides: 54 // content::WebContentsObserver overrides:
53 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; 55 void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
54 56
55 FrameUsbServices* GetFrameUsbService( 57 FrameUsbServices* GetFrameUsbService(
56 content::RenderFrameHost* render_frame_host); 58 content::RenderFrameHost* render_frame_host);
57 59
58 void GetPermissionProvider( 60 void GetPermissionProvider(
59 content::RenderFrameHost* render_frame_host, 61 content::RenderFrameHost* render_frame_host,
60 mojo::InterfaceRequest<device::usb::PermissionProvider> request); 62 mojo::InterfaceRequest<device::usb::PermissionProvider> request);
61 63
64 #if !defined(OS_ANDROID)
62 void GetPermissionBubble( 65 void GetPermissionBubble(
63 content::RenderFrameHost* render_frame_host, 66 content::RenderFrameHost* render_frame_host,
64 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); 67 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request);
68 #endif // !defined(OS_ANDROID)
65 69
66 FrameUsbServicesMap frame_usb_services_; 70 FrameUsbServicesMap frame_usb_services_;
67 71
68 DISALLOW_COPY_AND_ASSIGN(UsbTabHelper); 72 DISALLOW_COPY_AND_ASSIGN(UsbTabHelper);
69 }; 73 };
70 74
71 #endif // CHROME_BROWSER_USB_USB_TAB_HELPER_H_ 75 #endif // CHROME_BROWSER_USB_USB_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/lifetime/application_lifetime.cc ('k') | chrome/browser/usb/usb_tab_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698