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

Unified Diff: Source/web/WebLocalFrameImpl.cpp

Issue 1262163003: Add WebUSB bindings and client interface [part 1] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Handle null navigator.frame() without ASSERT Created 5 years, 5 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 | « Source/platform/RuntimeEnabledFeatures.in ('k') | public/platform/modules/webusb/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebLocalFrameImpl.cpp
diff --git a/Source/web/WebLocalFrameImpl.cpp b/Source/web/WebLocalFrameImpl.cpp
index 913a77f5c5e1b1067de3f5b4866584bd407fc450..dc2c8a1cc85ebe6ec6501c1581bfd54b262dcc84 100644
--- a/Source/web/WebLocalFrameImpl.cpp
+++ b/Source/web/WebLocalFrameImpl.cpp
@@ -163,6 +163,7 @@
#include "modules/screen_orientation/ScreenOrientationController.h"
#include "modules/vr/VRController.h"
#include "modules/wake_lock/ScreenWakeLock.h"
+#include "modules/webusb/USBController.h"
#include "platform/ScriptForbiddenScope.h"
#include "platform/TraceEvent.h"
#include "platform/UserGestureIndicator.h"
@@ -1725,6 +1726,8 @@ void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame)
PresentationController::provideTo(*m_frame, m_client ? m_client->presentationClient() : nullptr);
if (RuntimeEnabledFeatures::permissionsEnabled())
PermissionController::provideTo(*m_frame, m_client ? m_client->permissionClient() : nullptr);
+ if (RuntimeEnabledFeatures::webUSBEnabled())
+ USBController::provideTo(*m_frame, m_client ? m_client->usbClient() : nullptr);
if (RuntimeEnabledFeatures::webVREnabled())
VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : nullptr);
if (RuntimeEnabledFeatures::wakeLockEnabled())
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | public/platform/modules/webusb/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698