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

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

Issue 258693004: Add WebUserMediaClient getter on RenderFrameImpl in preparation for getting it from WebFrameClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« 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 2543 matching lines...) Expand 10 before | Expand all | Expand 10 after
2554 2554
2555 void RenderFrameImpl::willStartUsingPeerConnectionHandler( 2555 void RenderFrameImpl::willStartUsingPeerConnectionHandler(
2556 blink::WebLocalFrame* frame, 2556 blink::WebLocalFrame* frame,
2557 blink::WebRTCPeerConnectionHandler* handler) { 2557 blink::WebRTCPeerConnectionHandler* handler) {
2558 DCHECK(!frame_ || frame_ == frame); 2558 DCHECK(!frame_ || frame_ == frame);
2559 #if defined(ENABLE_WEBRTC) 2559 #if defined(ENABLE_WEBRTC)
2560 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame); 2560 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame);
2561 #endif 2561 #endif
2562 } 2562 }
2563 2563
2564 blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() {
2565 return render_view_->userMediaClient();
2566 }
2567
2564 bool RenderFrameImpl::willCheckAndDispatchMessageEvent( 2568 bool RenderFrameImpl::willCheckAndDispatchMessageEvent(
2565 blink::WebLocalFrame* sourceFrame, 2569 blink::WebLocalFrame* sourceFrame,
2566 blink::WebFrame* targetFrame, 2570 blink::WebFrame* targetFrame,
2567 blink::WebSecurityOrigin targetOrigin, 2571 blink::WebSecurityOrigin targetOrigin,
2568 blink::WebDOMMessageEvent event) { 2572 blink::WebDOMMessageEvent event) {
2569 DCHECK(!frame_ || frame_ == targetFrame); 2573 DCHECK(!frame_ || frame_ == targetFrame);
2570 // TODO(nasko): Move implementation here. Needed state: 2574 // TODO(nasko): Move implementation here. Needed state:
2571 // * is_swapped_out_ 2575 // * is_swapped_out_
2572 return render_view_->willCheckAndDispatchMessageEvent( 2576 return render_view_->willCheckAndDispatchMessageEvent(
2573 sourceFrame, targetFrame, targetOrigin, event); 2577 sourceFrame, targetFrame, targetOrigin, event);
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
3167 selection_text_offset_ = offset; 3171 selection_text_offset_ = offset;
3168 selection_range_ = range; 3172 selection_range_ = range;
3169 // This IPC is dispatched by RenderWidetHost, so use its routing ID. 3173 // This IPC is dispatched by RenderWidetHost, so use its routing ID.
3170 Send(new ViewHostMsg_SelectionChanged( 3174 Send(new ViewHostMsg_SelectionChanged(
3171 GetRenderWidget()->routing_id(), text, offset, range)); 3175 GetRenderWidget()->routing_id(), text, offset, range));
3172 } 3176 }
3173 GetRenderWidget()->UpdateSelectionBounds(); 3177 GetRenderWidget()->UpdateSelectionBounds();
3174 } 3178 }
3175 3179
3176 } // namespace content 3180 } // 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