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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1671553004: Enable WebUSB through the Experimental Framework. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove RuntimeEnabled=WebUSB. Created 4 years, 8 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/chrome_browser_main.cc ('k') | content/renderer/render_frame_impl.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 2743 matching lines...) Expand 10 before | Expand all | Expand 10 after
2754 2754
2755 #if defined(ENABLE_MOJO_MEDIA) 2755 #if defined(ENABLE_MOJO_MEDIA)
2756 registry->AddService( 2756 registry->AddService(
2757 base::Bind(&OutputProtectionImpl::Create, render_frame_host)); 2757 base::Bind(&OutputProtectionImpl::Create, render_frame_host));
2758 #endif // defined(ENABLE_MOJO_MEDIA) 2758 #endif // defined(ENABLE_MOJO_MEDIA)
2759 } 2759 }
2760 2760
2761 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( 2761 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
2762 content::ServiceRegistry* registry, 2762 content::ServiceRegistry* registry,
2763 content::RenderFrameHost* render_frame_host) { 2763 content::RenderFrameHost* render_frame_host) {
2764 // WebUSB is an experimental web API. It will only work if the experiment 2764 if (base::FeatureList::IsEnabled(features::kWebUsb)) {
2765 // is enabled and WebUSB feature is enabled.
2766 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
2767 switches::kEnableExperimentalWebPlatformFeatures) &&
2768 base::FeatureList::IsEnabled(features::kWebUsb)) {
2769 registry->AddService( 2765 registry->AddService(
2770 base::Bind(&CreateUsbDeviceManager, render_frame_host)); 2766 base::Bind(&CreateUsbDeviceManager, render_frame_host));
2771 registry->AddService( 2767 registry->AddService(
2772 base::Bind(&CreateWebUsbChooserService, render_frame_host)); 2768 base::Bind(&CreateWebUsbChooserService, render_frame_host));
2773 } 2769 }
2774 2770
2775 #if BUILDFLAG(ANDROID_JAVA_UI) 2771 #if BUILDFLAG(ANDROID_JAVA_UI)
2776 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices(registry); 2772 ChromeServiceRegistrarAndroid::RegisterRenderFrameMojoServices(registry);
2777 #endif 2773 #endif
2778 } 2774 }
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
2948 if (channel <= kMaxDisableEncryptionChannel) { 2944 if (channel <= kMaxDisableEncryptionChannel) {
2949 static const char* const kWebRtcDevSwitchNames[] = { 2945 static const char* const kWebRtcDevSwitchNames[] = {
2950 switches::kDisableWebRtcEncryption, 2946 switches::kDisableWebRtcEncryption,
2951 }; 2947 };
2952 to_command_line->CopySwitchesFrom(from_command_line, 2948 to_command_line->CopySwitchesFrom(from_command_line,
2953 kWebRtcDevSwitchNames, 2949 kWebRtcDevSwitchNames,
2954 arraysize(kWebRtcDevSwitchNames)); 2950 arraysize(kWebRtcDevSwitchNames));
2955 } 2951 }
2956 } 2952 }
2957 #endif // defined(ENABLE_WEBRTC) 2953 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698