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

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

Issue 256763003: 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 2546 matching lines...) Expand 10 before | Expand all | Expand 10 after
2557 DCHECK(!frame_ || frame_ == frame); 2557 DCHECK(!frame_ || frame_ == frame);
2558 #if defined(ENABLE_WEBRTC) 2558 #if defined(ENABLE_WEBRTC)
2559 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame); 2559 static_cast<RTCPeerConnectionHandler*>(handler)->associateWithFrame(frame);
2560 #endif 2560 #endif
2561 } 2561 }
2562 2562
2563 blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() { 2563 blink::WebUserMediaClient* RenderFrameImpl::userMediaClient() {
2564 return render_view_->userMediaClient(); 2564 return render_view_->userMediaClient();
2565 } 2565 }
2566 2566
2567 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() {
2568 return render_view_->webMIDIClient();
2569 }
2570
2567 bool RenderFrameImpl::willCheckAndDispatchMessageEvent( 2571 bool RenderFrameImpl::willCheckAndDispatchMessageEvent(
2568 blink::WebLocalFrame* sourceFrame, 2572 blink::WebLocalFrame* sourceFrame,
2569 blink::WebFrame* targetFrame, 2573 blink::WebFrame* targetFrame,
2570 blink::WebSecurityOrigin targetOrigin, 2574 blink::WebSecurityOrigin targetOrigin,
2571 blink::WebDOMMessageEvent event) { 2575 blink::WebDOMMessageEvent event) {
2572 DCHECK(!frame_ || frame_ == targetFrame); 2576 DCHECK(!frame_ || frame_ == targetFrame);
2573 // TODO(nasko): Move implementation here. Needed state: 2577 // TODO(nasko): Move implementation here. Needed state:
2574 // * is_swapped_out_ 2578 // * is_swapped_out_
2575 return render_view_->willCheckAndDispatchMessageEvent( 2579 return render_view_->willCheckAndDispatchMessageEvent(
2576 sourceFrame, targetFrame, targetOrigin, event); 2580 sourceFrame, targetFrame, targetOrigin, event);
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
3170 selection_text_offset_ = offset; 3174 selection_text_offset_ = offset;
3171 selection_range_ = range; 3175 selection_range_ = range;
3172 // This IPC is dispatched by RenderWidetHost, so use its routing ID. 3176 // This IPC is dispatched by RenderWidetHost, so use its routing ID.
3173 Send(new ViewHostMsg_SelectionChanged( 3177 Send(new ViewHostMsg_SelectionChanged(
3174 GetRenderWidget()->routing_id(), text, offset, range)); 3178 GetRenderWidget()->routing_id(), text, offset, range));
3175 } 3179 }
3176 GetRenderWidget()->UpdateSelectionBounds(); 3180 GetRenderWidget()->UpdateSelectionBounds();
3177 } 3181 }
3178 3182
3179 } // namespace content 3183 } // 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