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

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: Fixed the build 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
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_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/presentation/presentation_dispatcher.h"
84 #include "content/renderer/push_messaging_dispatcher.h" 85 #include "content/renderer/push_messaging_dispatcher.h"
85 #include "content/renderer/render_frame_proxy.h" 86 #include "content/renderer/render_frame_proxy.h"
86 #include "content/renderer/render_process.h" 87 #include "content/renderer/render_process.h"
87 #include "content/renderer/render_thread_impl.h" 88 #include "content/renderer/render_thread_impl.h"
88 #include "content/renderer/render_view_impl.h" 89 #include "content/renderer/render_view_impl.h"
89 #include "content/renderer/render_widget_fullscreen_pepper.h" 90 #include "content/renderer/render_widget_fullscreen_pepper.h"
90 #include "content/renderer/renderer_webapplicationcachehost_impl.h" 91 #include "content/renderer/renderer_webapplicationcachehost_impl.h"
91 #include "content/renderer/renderer_webcolorchooser_impl.h" 92 #include "content/renderer/renderer_webcolorchooser_impl.h"
92 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h" 93 #include "content/renderer/screen_orientation/screen_orientation_dispatcher.h"
93 #include "content/renderer/shared_worker_repository.h" 94 #include "content/renderer/shared_worker_repository.h"
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 media_player_manager_(NULL), 581 media_player_manager_(NULL),
581 #endif 582 #endif
582 #if defined(ENABLE_BROWSER_CDMS) 583 #if defined(ENABLE_BROWSER_CDMS)
583 cdm_manager_(NULL), 584 cdm_manager_(NULL),
584 #endif 585 #endif
585 #if defined(VIDEO_HOLE) 586 #if defined(VIDEO_HOLE)
586 contains_media_player_(false), 587 contains_media_player_(false),
587 #endif 588 #endif
588 geolocation_dispatcher_(NULL), 589 geolocation_dispatcher_(NULL),
589 push_messaging_dispatcher_(NULL), 590 push_messaging_dispatcher_(NULL),
591 presentation_dispatcher_(NULL),
590 screen_orientation_dispatcher_(NULL), 592 screen_orientation_dispatcher_(NULL),
591 manifest_manager_(NULL), 593 manifest_manager_(NULL),
592 accessibility_mode_(AccessibilityModeOff), 594 accessibility_mode_(AccessibilityModeOff),
593 renderer_accessibility_(NULL), 595 renderer_accessibility_(NULL),
594 weak_factory_(this) { 596 weak_factory_(this) {
595 std::pair<RoutingIDFrameMap::iterator, bool> result = 597 std::pair<RoutingIDFrameMap::iterator, bool> result =
596 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this)); 598 g_routing_id_frame_map.Get().insert(std::make_pair(routing_id_, this));
597 CHECK(result.second) << "Inserting a duplicate item."; 599 CHECK(result.second) << "Inserting a duplicate item.";
598 600
599 RenderThread::Get()->AddRoute(routing_id_, this); 601 RenderThread::Get()->AddRoute(routing_id_, this);
(...skipping 2637 matching lines...) Expand 10 before | Expand all | Expand 10 after
3237 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle); 3239 WebSocketBridge* impl = static_cast<WebSocketBridge*>(handle);
3238 impl->set_render_frame_id(routing_id_); 3240 impl->set_render_frame_id(routing_id_);
3239 } 3241 }
3240 3242
3241 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() { 3243 blink::WebGeolocationClient* RenderFrameImpl::geolocationClient() {
3242 if (!geolocation_dispatcher_) 3244 if (!geolocation_dispatcher_)
3243 geolocation_dispatcher_ = new GeolocationDispatcher(this); 3245 geolocation_dispatcher_ = new GeolocationDispatcher(this);
3244 return geolocation_dispatcher_; 3246 return geolocation_dispatcher_;
3245 } 3247 }
3246 3248
3249 blink::WebPresentationClient* RenderFrameImpl::presentationClient() {
3250 if (!presentation_dispatcher_)
3251 presentation_dispatcher_ = new PresentationDispatcher(this);
3252 return presentation_dispatcher_;
3253 }
3254
3247 blink::WebPushClient* RenderFrameImpl::pushClient() { 3255 blink::WebPushClient* RenderFrameImpl::pushClient() {
3248 if (!push_messaging_dispatcher_) 3256 if (!push_messaging_dispatcher_)
3249 push_messaging_dispatcher_ = new PushMessagingDispatcher(this); 3257 push_messaging_dispatcher_ = new PushMessagingDispatcher(this);
3250 return push_messaging_dispatcher_; 3258 return push_messaging_dispatcher_;
3251 } 3259 }
3252 3260
3253 void RenderFrameImpl::willStartUsingPeerConnectionHandler( 3261 void RenderFrameImpl::willStartUsingPeerConnectionHandler(
3254 blink::WebLocalFrame* frame, 3262 blink::WebLocalFrame* frame,
3255 blink::WebRTCPeerConnectionHandler* handler) { 3263 blink::WebRTCPeerConnectionHandler* handler) {
3256 DCHECK(!frame_ || frame_ == frame); 3264 DCHECK(!frame_ || frame_ == frame);
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
4315 4323
4316 #if defined(ENABLE_BROWSER_CDMS) 4324 #if defined(ENABLE_BROWSER_CDMS)
4317 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4325 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4318 if (!cdm_manager_) 4326 if (!cdm_manager_)
4319 cdm_manager_ = new RendererCdmManager(this); 4327 cdm_manager_ = new RendererCdmManager(this);
4320 return cdm_manager_; 4328 return cdm_manager_;
4321 } 4329 }
4322 #endif // defined(ENABLE_BROWSER_CDMS) 4330 #endif // defined(ENABLE_BROWSER_CDMS)
4323 4331
4324 } // namespace content 4332 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698