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

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

Issue 2129913005: Revert of Web MIDI: use mojom::blink::PermissionService directly to ask permission (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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
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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 #include "public/web/WebScriptSource.h" 214 #include "public/web/WebScriptSource.h"
215 #include "public/web/WebSerializedScriptValue.h" 215 #include "public/web/WebSerializedScriptValue.h"
216 #include "public/web/WebTreeScopeType.h" 216 #include "public/web/WebTreeScopeType.h"
217 #include "skia/ext/platform_canvas.h" 217 #include "skia/ext/platform_canvas.h"
218 #include "web/AssociatedURLLoader.h" 218 #include "web/AssociatedURLLoader.h"
219 #include "web/AudioOutputDeviceClientImpl.h" 219 #include "web/AudioOutputDeviceClientImpl.h"
220 #include "web/CompositionUnderlineVectorBuilder.h" 220 #include "web/CompositionUnderlineVectorBuilder.h"
221 #include "web/FindInPageCoordinates.h" 221 #include "web/FindInPageCoordinates.h"
222 #include "web/IndexedDBClientImpl.h" 222 #include "web/IndexedDBClientImpl.h"
223 #include "web/LocalFileSystemClient.h" 223 #include "web/LocalFileSystemClient.h"
224 #include "web/MIDIClientProxy.h"
224 #include "web/NavigatorContentUtilsClientImpl.h" 225 #include "web/NavigatorContentUtilsClientImpl.h"
225 #include "web/NotificationPermissionClientImpl.h" 226 #include "web/NotificationPermissionClientImpl.h"
226 #include "web/RemoteFrameOwner.h" 227 #include "web/RemoteFrameOwner.h"
227 #include "web/SharedWorkerRepositoryClientImpl.h" 228 #include "web/SharedWorkerRepositoryClientImpl.h"
228 #include "web/SuspendableScriptExecutor.h" 229 #include "web/SuspendableScriptExecutor.h"
229 #include "web/TextFinder.h" 230 #include "web/TextFinder.h"
230 #include "web/WebDataSourceImpl.h" 231 #include "web/WebDataSourceImpl.h"
231 #include "web/WebDevToolsAgentImpl.h" 232 #include "web/WebDevToolsAgentImpl.h"
232 #include "web/WebFrameWidgetImpl.h" 233 #include "web/WebFrameWidgetImpl.h"
233 #include "web/WebPluginContainerImpl.h" 234 #include "web/WebPluginContainerImpl.h"
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1460 1461
1461 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used. 1462 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used.
1462 if (!m_frame) 1463 if (!m_frame)
1463 return; 1464 return;
1464 1465
1465 if (m_client) 1466 if (m_client)
1466 providePushControllerTo(*m_frame, m_client->pushClient()); 1467 providePushControllerTo(*m_frame, m_client->pushClient());
1467 1468
1468 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient Impl::create()); 1469 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient Impl::create());
1469 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1470 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1471 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI Client() : nullptr));
1470 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); 1472 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create());
1471 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1473 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1472 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this)); 1474 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this));
1473 1475
1474 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); 1476 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled();
1475 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) 1477 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX)
1476 enableWebBluetooth = true; 1478 enableWebBluetooth = true;
1477 #endif 1479 #endif
1478 if (enableWebBluetooth) 1480 if (enableWebBluetooth)
1479 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1481 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
2141 { 2143 {
2142 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2144 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2143 } 2145 }
2144 2146
2145 void WebLocalFrameImpl::clearActiveFindMatch() 2147 void WebLocalFrameImpl::clearActiveFindMatch()
2146 { 2148 {
2147 ensureTextFinder().clearActiveFindMatch(); 2149 ensureTextFinder().clearActiveFindMatch();
2148 } 2150 }
2149 2151
2150 } // namespace blink 2152 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/MIDIClientProxy.cpp ('k') | third_party/WebKit/Source/web/WebMIDIPermissionRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698