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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1316203006: Convert DeviceManagerDelegate to PermissionProvider mojo interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment and move ctor. Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/usb/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 0f9113561b6b3e947b78bc6421dd00819f02bfbe..ec15b5d16a021abc99655d4227ce8d081dc014da 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -259,6 +259,10 @@
#include "chrome/browser/media/router/presentation_service_delegate_impl.h"
#endif
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+#include "chrome/browser/usb/web_usb_permission_provider.h"
+#endif
+
using base::FileDescriptor;
using blink::WebWindowFeatures;
using content::AccessTokenStore;
@@ -2516,6 +2520,10 @@ void ChromeContentBrowserClient::RegisterFrameMojoShellServices(
base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
render_frame_host));
#endif
+#if !defined(OS_ANDROID) && !defined(OS_IOS)
+ registry->AddService(
+ base::Bind(&WebUSBPermissionProvider::Create, render_frame_host));
+#endif
}
void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
« no previous file with comments | « no previous file | chrome/browser/usb/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698