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

Unified Diff: content/renderer/render_frame_impl.cc

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/LayoutTests/webmidi/loopback-receive.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 87b19f037334daf82d1a3a41491a018d61a35eba..db7242bce67a9b0995cde3fe8a29c56a4d2fa453 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -107,6 +107,7 @@
#include "content/renderer/media/media_permission_dispatcher.h"
#include "content/renderer/media/media_stream_dispatcher.h"
#include "content/renderer/media/media_stream_renderer_factory_impl.h"
+#include "content/renderer/media/midi_dispatcher.h"
#include "content/renderer/media/render_media_log.h"
#include "content/renderer/media/renderer_webmediaplayer_delegate.h"
#include "content/renderer/media/user_media_client_impl.h"
@@ -1072,6 +1073,7 @@
handling_select_range_(false),
notification_permission_dispatcher_(NULL),
web_user_media_client_(NULL),
+ midi_dispatcher_(NULL),
#if defined(OS_ANDROID)
media_player_manager_(NULL),
media_session_manager_(NULL),
@@ -4327,6 +4329,12 @@
return web_encrypted_media_client_.get();
}
+blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() {
+ if (!midi_dispatcher_)
+ midi_dispatcher_ = new MidiDispatcher(this);
+ return midi_dispatcher_;
+}
+
blink::WebString RenderFrameImpl::userAgentOverride() {
if (!render_view_->webview() || !render_view_->webview()->mainFrame() ||
render_view_->renderer_preferences_.user_agent_override.empty()) {
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | third_party/WebKit/LayoutTests/webmidi/loopback-receive.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698