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

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

Issue 871663003: media: Add MediaPermission interface and MediaPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove test code. Created 5 years, 11 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 // 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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 #include "content/renderer/external_popup_menu.h" 65 #include "content/renderer/external_popup_menu.h"
66 #include "content/renderer/geolocation_dispatcher.h" 66 #include "content/renderer/geolocation_dispatcher.h"
67 #include "content/renderer/history_controller.h" 67 #include "content/renderer/history_controller.h"
68 #include "content/renderer/history_serialization.h" 68 #include "content/renderer/history_serialization.h"
69 #include "content/renderer/image_loading_helper.h" 69 #include "content/renderer/image_loading_helper.h"
70 #include "content/renderer/ime_event_guard.h" 70 #include "content/renderer/ime_event_guard.h"
71 #include "content/renderer/internal_document_state_data.h" 71 #include "content/renderer/internal_document_state_data.h"
72 #include "content/renderer/manifest/manifest_manager.h" 72 #include "content/renderer/manifest/manifest_manager.h"
73 #include "content/renderer/media/audio_renderer_mixer_manager.h" 73 #include "content/renderer/media/audio_renderer_mixer_manager.h"
74 #include "content/renderer/media/crypto/render_cdm_factory.h" 74 #include "content/renderer/media/crypto/render_cdm_factory.h"
75 #include "content/renderer/media/media_permission_dispatcher.h"
75 #include "content/renderer/media/media_stream_dispatcher.h" 76 #include "content/renderer/media/media_stream_dispatcher.h"
76 #include "content/renderer/media/media_stream_renderer_factory.h" 77 #include "content/renderer/media/media_stream_renderer_factory.h"
77 #include "content/renderer/media/midi_dispatcher.h" 78 #include "content/renderer/media/midi_dispatcher.h"
78 #include "content/renderer/media/render_media_log.h" 79 #include "content/renderer/media/render_media_log.h"
79 #include "content/renderer/media/user_media_client_impl.h" 80 #include "content/renderer/media/user_media_client_impl.h"
80 #include "content/renderer/media/webmediaplayer_ms.h" 81 #include "content/renderer/media/webmediaplayer_ms.h"
81 #include "content/renderer/mojo/service_registry_js_wrapper.h" 82 #include "content/renderer/mojo/service_registry_js_wrapper.h"
82 #include "content/renderer/notification_permission_dispatcher.h" 83 #include "content/renderer/notification_permission_dispatcher.h"
83 #include "content/renderer/npapi/plugin_channel_host.h" 84 #include "content/renderer/npapi/plugin_channel_host.h"
84 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 85 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 proxy_routing_id_(MSG_ROUTING_NONE), 630 proxy_routing_id_(MSG_ROUTING_NONE),
630 #if defined(ENABLE_PLUGINS) 631 #if defined(ENABLE_PLUGINS)
631 plugin_power_saver_helper_(NULL), 632 plugin_power_saver_helper_(NULL),
632 #endif 633 #endif
633 cookie_jar_(this), 634 cookie_jar_(this),
634 selection_text_offset_(0), 635 selection_text_offset_(0),
635 selection_range_(gfx::Range::InvalidRange()), 636 selection_range_(gfx::Range::InvalidRange()),
636 handling_select_range_(false), 637 handling_select_range_(false),
637 notification_permission_dispatcher_(NULL), 638 notification_permission_dispatcher_(NULL),
638 web_user_media_client_(NULL), 639 web_user_media_client_(NULL),
640 media_permission_dispatcher_(NULL),
639 midi_dispatcher_(NULL), 641 midi_dispatcher_(NULL),
640 #if defined(OS_ANDROID) 642 #if defined(OS_ANDROID)
641 media_player_manager_(NULL), 643 media_player_manager_(NULL),
642 #endif 644 #endif
643 #if defined(ENABLE_BROWSER_CDMS) 645 #if defined(ENABLE_BROWSER_CDMS)
644 cdm_manager_(NULL), 646 cdm_manager_(NULL),
645 #endif 647 #endif
646 #if defined(VIDEO_HOLE) 648 #if defined(VIDEO_HOLE)
647 contains_media_player_(false), 649 contains_media_player_(false),
648 #endif 650 #endif
(...skipping 2686 matching lines...) Expand 10 before | Expand all | Expand 10 after
3335 if (!web_encrypted_media_client_) { 3337 if (!web_encrypted_media_client_) {
3336 #if defined(ENABLE_PEPPER_CDMS) 3338 #if defined(ENABLE_PEPPER_CDMS)
3337 scoped_ptr<media::CdmFactory> cdm_factory( 3339 scoped_ptr<media::CdmFactory> cdm_factory(
3338 new RenderCdmFactory(base::Bind(PepperCdmWrapperImpl::Create, frame_))); 3340 new RenderCdmFactory(base::Bind(PepperCdmWrapperImpl::Create, frame_)));
3339 #elif defined(ENABLE_BROWSER_CDMS) 3341 #elif defined(ENABLE_BROWSER_CDMS)
3340 scoped_ptr<media::CdmFactory> cdm_factory( 3342 scoped_ptr<media::CdmFactory> cdm_factory(
3341 new RenderCdmFactory(GetCdmManager())); 3343 new RenderCdmFactory(GetCdmManager()));
3342 #else 3344 #else
3343 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory()); 3345 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory());
3344 #endif 3346 #endif
3345 web_encrypted_media_client_.reset( 3347
3346 new media::WebEncryptedMediaClientImpl(cdm_factory.Pass())); 3348 DCHECK(!media_permission_dispatcher_);
3349 media_permission_dispatcher_ = new MediaPermissionDispatcher(this);
3350
3351 web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
3352 cdm_factory.Pass(), media_permission_dispatcher_));
xhwang 2015/01/22 23:40:54 Note to myself: Need to fix HtmlDocument before co
3347 } 3353 }
3348 return web_encrypted_media_client_.get(); 3354 return web_encrypted_media_client_.get();
3349 } 3355 }
3350 3356
3351 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() { 3357 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() {
3352 if (!midi_dispatcher_) 3358 if (!midi_dispatcher_)
3353 midi_dispatcher_ = new MidiDispatcher(this); 3359 midi_dispatcher_ = new MidiDispatcher(this);
3354 return midi_dispatcher_; 3360 return midi_dispatcher_;
3355 } 3361 }
3356 3362
(...skipping 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
4390 4396
4391 #if defined(ENABLE_BROWSER_CDMS) 4397 #if defined(ENABLE_BROWSER_CDMS)
4392 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4398 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4393 if (!cdm_manager_) 4399 if (!cdm_manager_)
4394 cdm_manager_ = new RendererCdmManager(this); 4400 cdm_manager_ = new RendererCdmManager(this);
4395 return cdm_manager_; 4401 return cdm_manager_;
4396 } 4402 }
4397 #endif // defined(ENABLE_BROWSER_CDMS) 4403 #endif // defined(ENABLE_BROWSER_CDMS)
4398 4404
4399 } // namespace content 4405 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698