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

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

Issue 839773002: Plumbing from WebPresentationClient to the Presentation Mojo service for (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added OnChangeAvailabilityListenerRemoved Created 5 years, 10 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "content/renderer/media/media_stream_dispatcher.h" 75 #include "content/renderer/media/media_stream_dispatcher.h"
76 #include "content/renderer/media/media_stream_renderer_factory.h" 76 #include "content/renderer/media/media_stream_renderer_factory.h"
77 #include "content/renderer/media/midi_dispatcher.h" 77 #include "content/renderer/media/midi_dispatcher.h"
78 #include "content/renderer/media/render_media_log.h" 78 #include "content/renderer/media/render_media_log.h"
79 #include "content/renderer/media/user_media_client_impl.h" 79 #include "content/renderer/media/user_media_client_impl.h"
80 #include "content/renderer/media/webmediaplayer_ms.h" 80 #include "content/renderer/media/webmediaplayer_ms.h"
81 #include "content/renderer/mojo/service_registry_js_wrapper.h" 81 #include "content/renderer/mojo/service_registry_js_wrapper.h"
82 #include "content/renderer/notification_permission_dispatcher.h" 82 #include "content/renderer/notification_permission_dispatcher.h"
83 #include "content/renderer/npapi/plugin_channel_host.h" 83 #include "content/renderer/npapi/plugin_channel_host.h"
84 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 84 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
85 #include "content/renderer/presentation/presentation_dispatcher.h"
85 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" 86 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
86 #include "content/renderer/render_frame_proxy.h" 87 #include "content/renderer/render_frame_proxy.h"
87 #include "content/renderer/render_process.h" 88 #include "content/renderer/render_process.h"
88 #include "content/renderer/render_thread_impl.h" 89 #include "content/renderer/render_thread_impl.h"
89 #include "content/renderer/render_view_impl.h" 90 #include "content/renderer/render_view_impl.h"
90 #include "content/renderer/render_widget_fullscreen_pepper.h" 91 #include "content/renderer/render_widget_fullscreen_pepper.h"
91 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 92 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
92 #include "content/renderer/renderer_webcolorchooser_impl.h" 93 #include "content/renderer/renderer_webcolorchooser_impl.h"
93 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 94 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
94 #include "content/renderer/shared_worker_repository.h" 95 #include "content/renderer/shared_worker_repository.h"
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
680 media_player_manager_(NULL), 681 media_player_manager_(NULL),
681 #endif 682 #endif
682 #if defined(ENABLE_BROWSER_CDMS) 683 #if defined(ENABLE_BROWSER_CDMS)
683 cdm_manager_(NULL), 684 cdm_manager_(NULL),
684 #endif 685 #endif
685 #if defined(VIDEO_HOLE) 686 #if defined(VIDEO_HOLE)
686 contains_media_player_(false), 687 contains_media_player_(false),
687 #endif 688 #endif
688 geolocation_dispatcher_(NULL), 689 geolocation_dispatcher_(NULL),
689 push_messaging_dispatcher_(NULL), 690 push_messaging_dispatcher_(NULL),
691 presentation_dispatcher_(NULL),
690 screen_orientation_dispatcher_(NULL), 692 screen_orientation_dispatcher_(NULL),
691 manifest_manager_(NULL), 693 manifest_manager_(NULL),
692 accessibility_mode_(AccessibilityModeOff), 694 accessibility_mode_(AccessibilityModeOff),
693 renderer_accessibility_(NULL), 695 renderer_accessibility_(NULL),
694 weak_factory_(this) { 696 weak_factory_(this) {
695 std::pair<RoutingIDFrameMap::iterator, bool> result = 697 std::pair<RoutingIDFrameMap::iterator, bool> result =
696 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 698 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
697 CHECK(result.second) << "Inserting a duplicate item."; 699 CHECK(result.second) << "Inserting a duplicate item.";
698 700
699 RenderThread::Get()->AddRoute(routing_id_, this); 701 RenderThread::Get()->AddRoute(routing_id_, this);
(...skipping 2650 matching lines...) Expand 10 before | Expand all | Expand 10 after
3350 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle); 3352 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle);
3351 impl->set_render_frame_id(routing_id_); 3353 impl->set_render_frame_id(routing_id_);
3352 } 3354 }
3353 3355
3354 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() { 3356 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() {
3355 if (!geolocation_dispatcher_) 3357 if (!geolocation_dispatcher_)
3356 geolocation_dispatcher_ = new GeolocationDispatcher(this); 3358 geolocation_dispatcher_ = new GeolocationDispatcher(this);
3357 return geolocation_dispatcher_; 3359 return geolocation_dispatcher_;
3358 } 3360 }
3359 3361
3362 blink::WebPresentationClient* RenderFrameImpl::presentationClient() {
3363 if (!presentation_dispatcher_)
3364 presentation_dispatcher_ = new PresentationDispatcher(this);
3365 return presentation_dispatcher_;
3366 }
3367
3360 blink::WebPushClient* RenderFrameImpl::pushClient() { 3368 blink::WebPushClient* RenderFrameImpl::pushClient() {
3361 if (!push_messaging_dispatcher_) 3369 if (!push_messaging_dispatcher_)
3362 push_messaging_dispatcher_ = new PushMessagingDispatcher(this); 3370 push_messaging_dispatcher_ = new PushMessagingDispatcher(this);
3363 return push_messaging_dispatcher_; 3371 return push_messaging_dispatcher_;
3364 } 3372 }
3365 3373
3366 void RenderFrameImpl::willStartUsingPeerConnectionHandler( 3374 void RenderFrameImpl::willStartUsingPeerConnectionHandler(
3367 blink::WebLocalFrame* frame, 3375 blink::WebLocalFrame* frame,
3368 blink::WebRTCPeerConnectionHandler* handler) { 3376 blink::WebRTCPeerConnectionHandler* handler) {
3369 DCHECK(!frame_ || frame_ == frame); 3377 DCHECK(!frame_ || frame_ == frame);
(...skipping 1078 matching lines...) Expand 10 before | Expand all | Expand 10 after
4448 4456
4449 #if defined(ENABLE_BROWSER_CDMS) 4457 #if defined(ENABLE_BROWSER_CDMS)
4450 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4458 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4451 if (!cdm_manager_) 4459 if (!cdm_manager_)
4452 cdm_manager_ = new RendererCdmManager(this); 4460 cdm_manager_ = new RendererCdmManager(this);
4453 return cdm_manager_; 4461 return cdm_manager_;
4454 } 4462 }
4455 #endif // defined(ENABLE_BROWSER_CDMS) 4463 #endif // defined(ENABLE_BROWSER_CDMS)
4456 4464
4457 } // namespace content 4465 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698