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

Side by Side Diff: content/renderer/render_frame_impl.h

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
« no previous file with comments | « content/renderer/media/midi_dispatcher.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after
599 void requestStorageQuota(blink::WebStorageQuotaType type, 599 void requestStorageQuota(blink::WebStorageQuotaType type,
600 unsigned long long requested_size, 600 unsigned long long requested_size,
601 blink::WebStorageQuotaCallbacks callbacks) override; 601 blink::WebStorageQuotaCallbacks callbacks) override;
602 void willOpenWebSocket(blink::WebSocketHandle* handle) override; 602 void willOpenWebSocket(blink::WebSocketHandle* handle) override;
603 blink::WebPushClient* pushClient() override; 603 blink::WebPushClient* pushClient() override;
604 blink::WebPresentationClient* presentationClient() override; 604 blink::WebPresentationClient* presentationClient() override;
605 void willStartUsingPeerConnectionHandler( 605 void willStartUsingPeerConnectionHandler(
606 blink::WebRTCPeerConnectionHandler* handler) override; 606 blink::WebRTCPeerConnectionHandler* handler) override;
607 blink::WebUserMediaClient* userMediaClient() override; 607 blink::WebUserMediaClient* userMediaClient() override;
608 blink::WebEncryptedMediaClient* encryptedMediaClient() override; 608 blink::WebEncryptedMediaClient* encryptedMediaClient() override;
609 blink::WebMIDIClient* webMIDIClient() override;
609 blink::WebString userAgentOverride() override; 610 blink::WebString userAgentOverride() override;
610 blink::WebString doNotTrackValue() override; 611 blink::WebString doNotTrackValue() override;
611 bool allowWebGL(bool default_value) override; 612 bool allowWebGL(bool default_value) override;
612 blink::WebScreenOrientationClient* webScreenOrientationClient() override; 613 blink::WebScreenOrientationClient* webScreenOrientationClient() override;
613 bool isControlledByServiceWorker(blink::WebDataSource& data_source) override; 614 bool isControlledByServiceWorker(blink::WebDataSource& data_source) override;
614 int64_t serviceWorkerID(blink::WebDataSource& data_source) override; 615 int64_t serviceWorkerID(blink::WebDataSource& data_source) override;
615 void postAccessibilityEvent(const blink::WebAXObject& obj, 616 void postAccessibilityEvent(const blink::WebAXObject& obj,
616 blink::WebAXEvent event) override; 617 blink::WebAXEvent event) override;
617 void handleAccessibilityFindInPageResult( 618 void handleAccessibilityFindInPageResult(
618 int identifier, 619 int identifier,
(...skipping 548 matching lines...) Expand 10 before | Expand all | Expand 10 after
1167 web_encrypted_media_client_; 1168 web_encrypted_media_client_;
1168 1169
1169 // The media permission dispatcher attached to this frame. 1170 // The media permission dispatcher attached to this frame.
1170 std::unique_ptr<MediaPermissionDispatcher> media_permission_dispatcher_; 1171 std::unique_ptr<MediaPermissionDispatcher> media_permission_dispatcher_;
1171 1172
1172 #if defined(ENABLE_MOJO_MEDIA) 1173 #if defined(ENABLE_MOJO_MEDIA)
1173 // The media interface provider attached to this frame, lazily initialized. 1174 // The media interface provider attached to this frame, lazily initialized.
1174 std::unique_ptr<MediaInterfaceProvider> media_interface_provider_; 1175 std::unique_ptr<MediaInterfaceProvider> media_interface_provider_;
1175 #endif 1176 #endif
1176 1177
1178 // MidiClient attached to this frame; lazily initialized.
1179 MidiDispatcher* midi_dispatcher_;
1180
1177 #if defined(OS_ANDROID) 1181 #if defined(OS_ANDROID)
1178 // Manages all media players and sessions in this render frame for 1182 // Manages all media players and sessions in this render frame for
1179 // communicating with the real media player and sessions in the 1183 // communicating with the real media player and sessions in the
1180 // browser process. It's okay to use raw pointers since they're both 1184 // browser process. It's okay to use raw pointers since they're both
1181 // RenderFrameObservers. 1185 // RenderFrameObservers.
1182 RendererMediaPlayerManager* media_player_manager_; 1186 RendererMediaPlayerManager* media_player_manager_;
1183 RendererMediaSessionManager* media_session_manager_; 1187 RendererMediaSessionManager* media_session_manager_;
1184 #endif 1188 #endif
1185 1189
1186 media::SurfaceManager* media_surface_manager_; 1190 media::SurfaceManager* media_surface_manager_;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
1297 mojom::FrameHostPtr frame_host_; 1301 mojom::FrameHostPtr frame_host_;
1298 1302
1299 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1303 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1300 1304
1301 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1305 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1302 }; 1306 };
1303 1307
1304 } // namespace content 1308 } // namespace content
1305 1309
1306 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1310 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/midi_dispatcher.cc ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698