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

Side by Side Diff: Source/web/WebLocalFrameImpl.cpp

Issue 1228283003: Attach a WebBluetooth to the LocalFrame and use it if it's available. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@error-enum-cleanup
Patch Set: Always use BluetoothSupplement to get the WebBluetooth instance. 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 unified diff | Download patch
« no previous file with comments | « Source/modules/modules.gypi ('k') | public/platform/modules/bluetooth/WebBluetoothError.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #include "core/page/FocusController.h" 147 #include "core/page/FocusController.h"
148 #include "core/page/FrameTree.h" 148 #include "core/page/FrameTree.h"
149 #include "core/page/Page.h" 149 #include "core/page/Page.h"
150 #include "core/page/PrintContext.h" 150 #include "core/page/PrintContext.h"
151 #include "core/paint/DeprecatedPaintLayer.h" 151 #include "core/paint/DeprecatedPaintLayer.h"
152 #include "core/paint/ScopeRecorder.h" 152 #include "core/paint/ScopeRecorder.h"
153 #include "core/paint/TransformRecorder.h" 153 #include "core/paint/TransformRecorder.h"
154 #include "core/timing/DOMWindowPerformance.h" 154 #include "core/timing/DOMWindowPerformance.h"
155 #include "core/timing/Performance.h" 155 #include "core/timing/Performance.h"
156 #include "modules/app_banner/AppBannerController.h" 156 #include "modules/app_banner/AppBannerController.h"
157 #include "modules/bluetooth/BluetoothSupplement.h"
157 #include "modules/geolocation/GeolocationController.h" 158 #include "modules/geolocation/GeolocationController.h"
158 #include "modules/notifications/NotificationPermissionClient.h" 159 #include "modules/notifications/NotificationPermissionClient.h"
159 #include "modules/permissions/PermissionController.h" 160 #include "modules/permissions/PermissionController.h"
160 #include "modules/presentation/PresentationController.h" 161 #include "modules/presentation/PresentationController.h"
161 #include "modules/push_messaging/PushController.h" 162 #include "modules/push_messaging/PushController.h"
162 #include "modules/screen_orientation/ScreenOrientationController.h" 163 #include "modules/screen_orientation/ScreenOrientationController.h"
163 #include "modules/vr/VRController.h" 164 #include "modules/vr/VRController.h"
164 #include "platform/ScriptForbiddenScope.h" 165 #include "platform/ScriptForbiddenScope.h"
165 #include "platform/TraceEvent.h" 166 #include "platform/TraceEvent.h"
166 #include "platform/UserGestureIndicator.h" 167 #include "platform/UserGestureIndicator.h"
(...skipping 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1700 providePushControllerTo(*m_frame, m_client->pushClient()); 1701 providePushControllerTo(*m_frame, m_client->pushClient());
1701 1702
1702 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create()); 1703 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create());
1703 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1704 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1704 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); 1705 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get());
1705 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get())); 1706 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get()));
1706 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr)); 1707 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr));
1707 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1708 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1708 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl ::create(this)); 1709 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl ::create(this));
1709 1710
1711 if (RuntimeEnabledFeatures::webBluetoothEnabled())
1712 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->blueto oth() : nullptr);
1710 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1713 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1711 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr); 1714 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr);
1712 if (RuntimeEnabledFeatures::presentationEnabled()) 1715 if (RuntimeEnabledFeatures::presentationEnabled())
1713 PresentationController::provideTo(*m_frame, m_client ? m_client->pre sentationClient() : nullptr); 1716 PresentationController::provideTo(*m_frame, m_client ? m_client->pre sentationClient() : nullptr);
1714 if (RuntimeEnabledFeatures::permissionsEnabled()) 1717 if (RuntimeEnabledFeatures::permissionsEnabled())
1715 PermissionController::provideTo(*m_frame, m_client ? m_client->permi ssionClient() : nullptr); 1718 PermissionController::provideTo(*m_frame, m_client ? m_client->permi ssionClient() : nullptr);
1716 if (RuntimeEnabledFeatures::webVREnabled()) 1719 if (RuntimeEnabledFeatures::webVREnabled())
1717 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : nullptr); 1720 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : nullptr);
1718 } 1721 }
1719 } 1722 }
(...skipping 466 matching lines...) Expand 10 before | Expand all | Expand 10 after
2186 } 2189 }
2187 2190
2188 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2191 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2189 { 2192 {
2190 if (!frame()) 2193 if (!frame())
2191 return WebSandboxFlags::None; 2194 return WebSandboxFlags::None;
2192 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2195 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2193 } 2196 }
2194 2197
2195 } // namespace blink 2198 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/modules.gypi ('k') | public/platform/modules/bluetooth/WebBluetoothError.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698