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

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: Got rid of the PresentationServiceClient 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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 media_player_manager_(NULL), 642 media_player_manager_(NULL),
642 #endif 643 #endif
643 #if defined(ENABLE_BROWSER_CDMS) 644 #if defined(ENABLE_BROWSER_CDMS)
644 cdm_manager_(NULL), 645 cdm_manager_(NULL),
645 #endif 646 #endif
646 #if defined(VIDEO_HOLE) 647 #if defined(VIDEO_HOLE)
647 contains_media_player_(false), 648 contains_media_player_(false),
648 #endif 649 #endif
649 geolocation_dispatcher_(NULL), 650 geolocation_dispatcher_(NULL),
650 push_messaging_dispatcher_(NULL), 651 push_messaging_dispatcher_(NULL),
652 presentation_dispatcher_(NULL),
651 screen_orientation_dispatcher_(NULL), 653 screen_orientation_dispatcher_(NULL),
652 manifest_manager_(NULL), 654 manifest_manager_(NULL),
653 accessibility_mode_(AccessibilityModeOff), 655 accessibility_mode_(AccessibilityModeOff),
654 renderer_accessibility_(NULL), 656 renderer_accessibility_(NULL),
655 weak_factory_(this) { 657 weak_factory_(this) {
656 std::pair<RoutingIDFrameMap::iterator, bool> result = 658 std::pair<RoutingIDFrameMap::iterator, bool> result =
657 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 659 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
658 CHECK(result.second) << "Inserting a duplicate item."; 660 CHECK(result.second) << "Inserting a duplicate item.";
659 661
660 RenderThread::Get()->AddRoute(routing_id_, this); 662 RenderThread::Get()->AddRoute(routing_id_, this);
(...skipping 2642 matching lines...) Expand 10 before | Expand all | Expand 10 after
3303 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle); 3305 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle);
3304 impl->set_render_frame_id(routing_id_); 3306 impl->set_render_frame_id(routing_id_);
3305 } 3307 }
3306 3308
3307 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() { 3309 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() {
3308 if (!geolocation_dispatcher_) 3310 if (!geolocation_dispatcher_)
3309 geolocation_dispatcher_ = new GeolocationDispatcher(this); 3311 geolocation_dispatcher_ = new GeolocationDispatcher(this);
3310 return geolocation_dispatcher_; 3312 return geolocation_dispatcher_;
3311 } 3313 }
3312 3314
3315 blink::WebPresentationClient* RenderFrameImpl::presentationClient() {
3316 if (!presentation_dispatcher_)
3317 presentation_dispatcher_ = new PresentationDispatcher(this);
3318 return presentation_dispatcher_;
3319 }
3320
3313 blink::WebPushClient* RenderFrameImpl::pushClient() { 3321 blink::WebPushClient* RenderFrameImpl::pushClient() {
3314 if (!push_messaging_dispatcher_) 3322 if (!push_messaging_dispatcher_)
3315 push_messaging_dispatcher_ = new PushMessagingDispatcher(this); 3323 push_messaging_dispatcher_ = new PushMessagingDispatcher(this);
3316 return push_messaging_dispatcher_; 3324 return push_messaging_dispatcher_;
3317 } 3325 }
3318 3326
3319 void RenderFrameImpl::willStartUsingPeerConnectionHandler( 3327 void RenderFrameImpl::willStartUsingPeerConnectionHandler(
3320 blink::WebLocalFrame* frame, 3328 blink::WebLocalFrame* frame,
3321 blink::WebRTCPeerConnectionHandler* handler) { 3329 blink::WebRTCPeerConnectionHandler* handler) {
3322 DCHECK(!frame_ || frame_ == frame); 3330 DCHECK(!frame_ || frame_ == frame);
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
4390 4398
4391 #if defined(ENABLE_BROWSER_CDMS) 4399 #if defined(ENABLE_BROWSER_CDMS)
4392 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4400 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4393 if (!cdm_manager_) 4401 if (!cdm_manager_)
4394 cdm_manager_ = new RendererCdmManager(this); 4402 cdm_manager_ = new RendererCdmManager(this);
4395 return cdm_manager_; 4403 return cdm_manager_;
4396 } 4404 }
4397 #endif // defined(ENABLE_BROWSER_CDMS) 4405 #endif // defined(ENABLE_BROWSER_CDMS)
4398 4406
4399 } // namespace content 4407 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698