| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 462be0921a400456cebf0b598c7f44fe1a9b6ac2..c769b8cdeac05eb35edfa22f13259a1f9c157e57 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -229,7 +229,6 @@
|
| #include "content/renderer/media/android/stream_texture_wrapper_impl.h"
|
| #include "content/renderer/media/android/webmediaplayer_android.h"
|
| #include "media/base/android/media_codec_util.h"
|
| -#include "media/mojo/clients/mojo_renderer_factory.h" // nogncheck
|
| #include "third_party/WebKit/public/platform/WebFloatPoint.h"
|
| #endif
|
|
|
| @@ -1474,8 +1473,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) {
|
| @@ -1529,7 +1534,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)
|
| @@ -2566,11 +2571,8 @@ void RenderFrameImpl::DetachGuest(int element_instance_id) {
|
| void RenderFrameImpl::SetSelectedText(const base::string16& selection_text,
|
| size_t offset,
|
| const gfx::Range& range) {
|
| - // Use the routing id of Render Widget Host.
|
| - Send(new ViewHostMsg_SelectionChanged(GetRenderWidget()->routing_id(),
|
| - selection_text,
|
| - static_cast<uint32_t>(offset),
|
| - range));
|
| + Send(new FrameHostMsg_SelectionChanged(routing_id_, selection_text,
|
| + static_cast<uint32_t>(offset), range));
|
| }
|
|
|
| void RenderFrameImpl::EnsureMojoBuiltinsAreAvailable(
|
| @@ -4932,6 +4934,9 @@ void RenderFrameImpl::didStartLoading(bool to_different_document) {
|
| "id", routing_id_);
|
| render_view_->FrameDidStartLoading(frame_);
|
|
|
| + for (auto& observer : observers_)
|
| + observer.DidStartLoading();
|
| +
|
| // PlzNavigate: the browser is responsible for knowing the start of all
|
| // non-synchronous navigations.
|
| if (!IsBrowserSideNavigationEnabled() || !to_different_document)
|
| @@ -4948,6 +4953,8 @@ void RenderFrameImpl::didStopLoading() {
|
| history_subframe_unique_names_.clear();
|
|
|
| render_view_->FrameDidStopLoading(frame_);
|
| + for (auto& observer : observers_)
|
| + observer.DidStopLoading();
|
| Send(new FrameHostMsg_DidStopLoading(routing_id_));
|
| }
|
|
|
|
|