| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index eec99caa73e73b1e6d44b81bfc42c5fe8c484945..e2c9494348395102dfc56195a537d29a3afc7aa8 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -1481,8 +1481,14 @@ void RenderFrameImpl::OnImeFinishComposingText(bool keep_selection) {
|
| MediaStreamDispatcher* RenderFrameImpl::GetMediaStreamDispatcher() {
|
| if (!web_user_media_client_)
|
| InitializeUserMediaClient();
|
| - return web_user_media_client_ ?
|
| - web_user_media_client_->media_stream_dispatcher() : NULL;
|
| + return web_user_media_client_
|
| + ? web_user_media_client_->media_stream_dispatcher()
|
| + : nullptr;
|
| +}
|
| +
|
| +void RenderFrameImpl::ScriptedPrint(bool user_initiated) {
|
| + for (auto& observer : observers_)
|
| + observer.ScriptedPrint(user_initiated);
|
| }
|
|
|
| bool RenderFrameImpl::Send(IPC::Message* message) {
|
| @@ -1536,7 +1542,7 @@ bool RenderFrameImpl::OnMessageReceived(const IPC::Message& msg) {
|
| OnCustomContextMenuAction)
|
| #if defined(ENABLE_PLUGINS)
|
| IPC_MESSAGE_HANDLER(FrameMsg_SetPepperVolume, OnSetPepperVolume)
|
| -#endif // defined(ENABLE_PLUGINS)
|
| +#endif
|
| IPC_MESSAGE_HANDLER(InputMsg_Undo, OnUndo)
|
| IPC_MESSAGE_HANDLER(InputMsg_Redo, OnRedo)
|
| IPC_MESSAGE_HANDLER(InputMsg_Cut, OnCut)
|
|
|