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

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

Issue 1808203005: [OnionSoup] Moving VR service from content to Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase to ToT! Created 4 years, 7 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 1464 matching lines...) Expand 10 before | Expand all | Expand 10 after
1475 1475
1476 if (RuntimeEnabledFeatures::webBluetoothEnabled()) 1476 if (RuntimeEnabledFeatures::webBluetoothEnabled())
1477 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1477 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
1478 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1478 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1479 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); 1479 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr);
1480 if (RuntimeEnabledFeatures::presentationEnabled()) 1480 if (RuntimeEnabledFeatures::presentationEnabled())
1481 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); 1481 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr);
1482 if (RuntimeEnabledFeatures::permissionsEnabled()) 1482 if (RuntimeEnabledFeatures::permissionsEnabled())
1483 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr); 1483 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr);
1484 if (RuntimeEnabledFeatures::webVREnabled()) 1484 if (RuntimeEnabledFeatures::webVREnabled())
1485 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : n ullptr); 1485 VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry() : nullptr);
1486 if (RuntimeEnabledFeatures::wakeLockEnabled()) 1486 if (RuntimeEnabledFeatures::wakeLockEnabled())
1487 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry (): nullptr); 1487 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry (): nullptr);
1488 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1488 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1489 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); 1489 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create());
1490 if (RuntimeEnabledFeatures::installedAppEnabled()) 1490 if (RuntimeEnabledFeatures::installedAppEnabled())
1491 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); 1491 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr);
1492 } 1492 }
1493 1493
1494 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) 1494 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)
1495 { 1495 {
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
2106 return WebSandboxFlags::None; 2106 return WebSandboxFlags::None;
2107 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2107 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2108 } 2108 }
2109 2109
2110 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2110 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2111 { 2111 {
2112 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2112 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2113 } 2113 }
2114 2114
2115 } // namespace blink 2115 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/modules/vr/VRTypeConverters.cc ('k') | third_party/WebKit/public/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698