Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1471 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); | 1471 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); |
| 1472 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); | 1472 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); |
| 1473 m_geolocationClientProxy->setController(GeolocationController::from(m_frame. get())); | 1473 m_geolocationClientProxy->setController(GeolocationController::from(m_frame. get())); |
| 1474 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI Client() : nullptr)); | 1474 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI Client() : nullptr)); |
| 1475 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); | 1475 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); |
| 1476 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); | 1476 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); |
| 1477 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this)); | 1477 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this)); |
| 1478 | 1478 |
| 1479 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); | 1479 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); |
| 1480 #if OS(CHROMEOS) || OS(ANDROID) | 1480 #if OS(CHROMEOS) || OS(ANDROID) |
| 1481 enableWebBluetooth = true; | 1481 // TODO(https://crbug.com/584113) Enable Web Bluetooth Experiment. |
| 1482 // enableWebBluetooth = true; | |
|
dglazkov
2016/04/27 03:59:08
Could we remove the commented-out code? We try not
scheib
2016/04/27 04:13:34
Done.
| |
| 1482 #endif | 1483 #endif |
| 1483 | 1484 |
| 1484 if (enableWebBluetooth) | 1485 if (enableWebBluetooth) |
| 1485 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); | 1486 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); |
| 1486 | 1487 |
| 1487 if (RuntimeEnabledFeatures::screenOrientationEnabled()) | 1488 if (RuntimeEnabledFeatures::screenOrientationEnabled()) |
| 1488 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); | 1489 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); |
| 1489 if (RuntimeEnabledFeatures::presentationEnabled()) | 1490 if (RuntimeEnabledFeatures::presentationEnabled()) |
| 1490 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); | 1491 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); |
| 1491 if (RuntimeEnabledFeatures::permissionsEnabled()) | 1492 if (RuntimeEnabledFeatures::permissionsEnabled()) |
| (...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2113 return WebSandboxFlags::None; | 2114 return WebSandboxFlags::None; |
| 2114 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); | 2115 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); |
| 2115 } | 2116 } |
| 2116 | 2117 |
| 2117 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) | 2118 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) |
| 2118 { | 2119 { |
| 2119 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); | 2120 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 2120 } | 2121 } |
| 2121 | 2122 |
| 2122 } // namespace blink | 2123 } // namespace blink |
| OLD | NEW |