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

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

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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 "base/containers/scoped_ptr_map.h" 8 #include "base/containers/scoped_ptr_map.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "content/public/browser/web_contents_observer.h" 10 #include "content/public/browser/web_contents_observer.h"
11 #include "content/public/browser/web_contents_user_data.h" 11 #include "content/public/browser/web_contents_user_data.h"
12 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h" 12 #include "mojo/public/cpp/bindings/interface_request.h"
13 13
14 namespace device { 14 namespace device {
15 namespace usb { 15 namespace usb {
16 class DeviceManager; 16 class DeviceManager;
17 class PermissionProvider; 17 class PermissionProvider;
18 } 18 }
19 } 19 }
20 20
21 class WebUSBPermissionProvider; 21 class WebUSBPermissionProvider;
22 22
(...skipping 21 matching lines...) Expand all
44 content::RenderFrameHost* render_frame_host, 44 content::RenderFrameHost* render_frame_host,
45 mojo::InterfaceRequest<device::usb::PermissionProvider> request); 45 mojo::InterfaceRequest<device::usb::PermissionProvider> request);
46 46
47 base::ScopedPtrMap<content::RenderFrameHost*, 47 base::ScopedPtrMap<content::RenderFrameHost*,
48 scoped_ptr<WebUSBPermissionProvider>> permission_provider_; 48 scoped_ptr<WebUSBPermissionProvider>> permission_provider_;
49 49
50 DISALLOW_COPY_AND_ASSIGN(UsbTabHelper); 50 DISALLOW_COPY_AND_ASSIGN(UsbTabHelper);
51 }; 51 };
52 52
53 #endif // CHROME_BROWSER_USB_USB_TAB_HELPER_H_ 53 #endif // CHROME_BROWSER_USB_USB_TAB_HELPER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h ('k') | chrome/browser/usb/web_usb_permission_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698