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

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: Updated comment 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
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | 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 #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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "content/renderer/media/media_stream_dispatcher.h" 76 #include "content/renderer/media/media_stream_dispatcher.h"
77 #include "content/renderer/media/media_stream_renderer_factory.h" 77 #include "content/renderer/media/media_stream_renderer_factory.h"
78 #include "content/renderer/media/midi_dispatcher.h" 78 #include "content/renderer/media/midi_dispatcher.h"
79 #include "content/renderer/media/render_media_log.h" 79 #include "content/renderer/media/render_media_log.h"
80 #include "content/renderer/media/user_media_client_impl.h" 80 #include "content/renderer/media/user_media_client_impl.h"
81 #include "content/renderer/media/webmediaplayer_ms.h" 81 #include "content/renderer/media/webmediaplayer_ms.h"
82 #include "content/renderer/mojo/service_registry_js_wrapper.h" 82 #include "content/renderer/mojo/service_registry_js_wrapper.h"
83 #include "content/renderer/notification_permission_dispatcher.h" 83 #include "content/renderer/notification_permission_dispatcher.h"
84 #include "content/renderer/npapi/plugin_channel_host.h" 84 #include "content/renderer/npapi/plugin_channel_host.h"
85 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" 85 #include "content/renderer/pepper/plugin_instance_throttler_impl.h"
86 #include "content/renderer/presentation/presentation_dispatcher.h"
86 #include "content/renderer/push_messaging/push_messaging_dispatcher.h" 87 #include "content/renderer/push_messaging/push_messaging_dispatcher.h"
87 #include "content/renderer/render_frame_proxy.h" 88 #include "content/renderer/render_frame_proxy.h"
88 #include "content/renderer/render_process.h" 89 #include "content/renderer/render_process.h"
89 #include "content/renderer/render_thread_impl.h" 90 #include "content/renderer/render_thread_impl.h"
90 #include "content/renderer/render_view_impl.h" 91 #include "content/renderer/render_view_impl.h"
91 #include "content/renderer/render_widget_fullscreen_pepper.h" 92 #include "content/renderer/render_widget_fullscreen_pepper.h"
92 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 93 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
93 #include "content/renderer/renderer_webcolorchooser_impl.h" 94 #include "content/renderer/renderer_webcolorchooser_impl.h"
94 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 95 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
95 #include "content/renderer/shared_worker_repository.h" 96 #include "content/renderer/shared_worker_repository.h"
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
688 media_player_manager_(NULL), 689 media_player_manager_(NULL),
689 #endif 690 #endif
690 #if defined(ENABLE_BROWSER_CDMS) 691 #if defined(ENABLE_BROWSER_CDMS)
691 cdm_manager_(NULL), 692 cdm_manager_(NULL),
692 #endif 693 #endif
693 #if defined(VIDEO_HOLE) 694 #if defined(VIDEO_HOLE)
694 contains_media_player_(false), 695 contains_media_player_(false),
695 #endif 696 #endif
696 geolocation_dispatcher_(NULL), 697 geolocation_dispatcher_(NULL),
697 push_messaging_dispatcher_(NULL), 698 push_messaging_dispatcher_(NULL),
699 presentation_dispatcher_(NULL),
698 screen_orientation_dispatcher_(NULL), 700 screen_orientation_dispatcher_(NULL),
699 manifest_manager_(NULL), 701 manifest_manager_(NULL),
700 accessibility_mode_(AccessibilityModeOff), 702 accessibility_mode_(AccessibilityModeOff),
701 renderer_accessibility_(NULL), 703 renderer_accessibility_(NULL),
702 weak_factory_(this) { 704 weak_factory_(this) {
703 std::pair<RoutingIDFrameMap::iterator, bool> result = 705 std::pair<RoutingIDFrameMap::iterator, bool> result =
704 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 706 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
705 CHECK(result.second) << "Inserting a duplicate item."; 707 CHECK(result.second) << "Inserting a duplicate item.";
706 708
707 RenderThread::Get()->AddRoute(routing_id_, this); 709 RenderThread::Get()->AddRoute(routing_id_, this);
(...skipping 2650 matching lines...) Expand 10 before | Expand all | Expand 10 after
3358 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle); 3360 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle);
3359 impl->set_render_frame_id(routing_id_); 3361 impl->set_render_frame_id(routing_id_);
3360 } 3362 }
3361 3363
3362 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() { 3364 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() {
3363 if (!geolocation_dispatcher_) 3365 if (!geolocation_dispatcher_)
3364 geolocation_dispatcher_ = new GeolocationDispatcher(this); 3366 geolocation_dispatcher_ = new GeolocationDispatcher(this);
3365 return geolocation_dispatcher_; 3367 return geolocation_dispatcher_;
3366 } 3368 }
3367 3369
3370 blink::WebPresentationClient* RenderFrameImpl::presentationClient() {
3371 if (!presentation_dispatcher_)
3372 presentation_dispatcher_ = new PresentationDispatcher(this);
3373 return presentation_dispatcher_;
3374 }
3375
3368 blink::WebPushClient* RenderFrameImpl::pushClient() { 3376 blink::WebPushClient* RenderFrameImpl::pushClient() {
3369 if (!push_messaging_dispatcher_) 3377 if (!push_messaging_dispatcher_)
3370 push_messaging_dispatcher_ = new PushMessagingDispatcher(this); 3378 push_messaging_dispatcher_ = new PushMessagingDispatcher(this);
3371 return push_messaging_dispatcher_; 3379 return push_messaging_dispatcher_;
3372 } 3380 }
3373 3381
3374 void RenderFrameImpl::willStartUsingPeerConnectionHandler( 3382 void RenderFrameImpl::willStartUsingPeerConnectionHandler(
3375 blink::WebLocalFrame* frame, 3383 blink::WebLocalFrame* frame,
3376 blink::WebRTCPeerConnectionHandler* handler) { 3384 blink::WebRTCPeerConnectionHandler* handler) {
3377 DCHECK(!frame_ || frame_ == frame); 3385 DCHECK(!frame_ || frame_ == frame);
(...skipping 1080 matching lines...) Expand 10 before | Expand all | Expand 10 after
4458 4466
4459 #if defined(ENABLE_BROWSER_CDMS) 4467 #if defined(ENABLE_BROWSER_CDMS)
4460 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4468 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4461 if (!cdm_manager_) 4469 if (!cdm_manager_)
4462 cdm_manager_ = new RendererCdmManager(this); 4470 cdm_manager_ = new RendererCdmManager(this);
4463 return cdm_manager_; 4471 return cdm_manager_;
4464 } 4472 }
4465 #endif // defined(ENABLE_BROWSER_CDMS) 4473 #endif // defined(ENABLE_BROWSER_CDMS)
4466 4474
4467 } // namespace content 4475 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698