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

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

Issue 1763923002: Remove Web Bluetooth from Experimental in M50. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge TOT Created 4 years, 9 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 | « third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | 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 1519 matching lines...) Expand 10 before | Expand all | Expand 10 after
1530 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create()); 1530 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionCl ientImpl::create());
1531 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1531 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1532 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); 1532 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get());
1533 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get())); 1533 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get()));
1534 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr)); 1534 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->web MIDIClient() : nullptr));
1535 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1535 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1536 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl ::create(this)); 1536 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl ::create(this));
1537 1537
1538 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); 1538 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled();
1539 #if OS(CHROMEOS) || OS(ANDROID) 1539 #if OS(CHROMEOS) || OS(ANDROID)
1540 enableWebBluetooth = true; 1540 // TODO(https://crbug.com/584113) Enable Web Bluetooth Experiment.
1541 // enableWebBluetooth = true;
1541 #endif 1542 #endif
1542 1543
1543 if (enableWebBluetooth) { 1544 if (enableWebBluetooth) {
1544 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->blueto oth() : nullptr); 1545 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->blueto oth() : nullptr);
1545 } 1546 }
1546 1547
1547 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1548 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1548 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr); 1549 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client ->webScreenOrientationClient() : nullptr);
1549 if (RuntimeEnabledFeatures::presentationEnabled()) 1550 if (RuntimeEnabledFeatures::presentationEnabled())
1550 PresentationController::provideTo(*m_frame, m_client ? m_client->pre sentationClient() : nullptr); 1551 PresentationController::provideTo(*m_frame, m_client ? m_client->pre sentationClient() : nullptr);
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
2188 return WebSandboxFlags::None; 2189 return WebSandboxFlags::None;
2189 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2190 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2190 } 2191 }
2191 2192
2192 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2193 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2193 { 2194 {
2194 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2195 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2195 } 2196 }
2196 2197
2197 } // namespace blink 2198 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698