Merge 21466 - Allow the browser to send actions back to the render for media ...

chrome/browser/renderer_host/render_view_host.cc

Index: chrome/browser/renderer_host/render_view_host.cc
===================================================================
--- chrome/browser/renderer_host/render_view_host.cc	(revision 21785)
+++ chrome/browser/renderer_host/render_view_host.cc	(working copy)
@@ -1241,6 +1241,13 @@
   delegate_->ShowModalHTMLDialog(url, width, height, json_arguments, reply_msg);
 }
 
+void RenderViewHost::MediaPlayerActionAt(int x,
+                                         int y,
+                                         const MediaPlayerAction& action) {
+  // TODO(ajwong): Which thread should run this?  Does it matter?
+  Send(new ViewMsg_MediaPlayerActionAt(routing_id(), x, y, action));
+}
+
 void RenderViewHost::OnMsgPasswordFormsSeen(
     const std::vector<webkit_glue::PasswordForm>& forms) {
   delegate_->PasswordFormsSeen(forms);
Property changes on: chrome\browser\renderer_host\render_view_host.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/renderer_host/render_view_host.cc:r21466