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

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

Issue 1858293002: bluetooth: Enable Web Bluetooth on experimental framework (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@my-origin
Patch Set: 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
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 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after
1518 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient Impl::create()); 1518 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient Impl::create());
1519 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1519 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1520 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); 1520 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get());
1521 m_geolocationClientProxy->setController(GeolocationController::from(m_frame. get())); 1521 m_geolocationClientProxy->setController(GeolocationController::from(m_frame. get()));
1522 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI Client() : nullptr)); 1522 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI Client() : nullptr));
1523 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1523 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1524 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this)); 1524 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this));
1525 1525
1526 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); 1526 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled();
1527 #if OS(CHROMEOS) || OS(ANDROID) 1527 #if OS(CHROMEOS) || OS(ANDROID)
1528 // TODO(https://crbug.com/584113) Enable Web Bluetooth Experiment. 1528 enableWebBluetooth = true;
1529 // enableWebBluetooth = true;
1530 #endif 1529 #endif
1531 1530
1532 if (enableWebBluetooth) 1531 if (enableWebBluetooth)
1533 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1532 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
1534 1533
1535 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1534 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1536 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); 1535 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr);
1537 if (RuntimeEnabledFeatures::presentationEnabled()) 1536 if (RuntimeEnabledFeatures::presentationEnabled())
1538 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); 1537 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr);
1539 if (RuntimeEnabledFeatures::permissionsEnabled()) 1538 if (RuntimeEnabledFeatures::permissionsEnabled())
(...skipping 632 matching lines...) Expand 10 before | Expand all | Expand 10 after
2172 return WebSandboxFlags::None; 2171 return WebSandboxFlags::None;
2173 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2172 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2174 } 2173 }
2175 2174
2176 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2175 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2177 { 2176 {
2178 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2177 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2179 } 2178 }
2180 2179
2181 } // namespace blink 2180 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698