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

Unified Diff: content/renderer/render_frame_impl.cc

Issue 2426503002: Make printing work better with OOPIF. (Closed)
Patch Set: Fix build, nits Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
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)

Powered by Google App Engine
This is Rietveld 408576698