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

chrome/browser/renderer_host/render_view_host.h

Index: chrome/browser/renderer_host/render_view_host.h
===================================================================
--- chrome/browser/renderer_host/render_view_host.h	(revision 21785)
+++ chrome/browser/renderer_host/render_view_host.h	(working copy)
@@ -25,6 +25,7 @@
 class SkBitmap;
 class ViewMsg_Navigate;
 struct ContextMenuParams;
+struct MediaPlayerAction;
 struct ViewHostMsg_DidPrintPage_Params;
 struct ViewMsg_Navigate_Params;
 struct WebDropData;
@@ -292,6 +293,9 @@
   void ModalHTMLDialogClosed(IPC::Message* reply_msg,
                              const std::string& json_retval);
 
+  // Send an action to the media player element located at |x|, |y|.
+  void MediaPlayerActionAt(int x, int y, const MediaPlayerAction& action);
+
   // Copies the image at the specified point.
   void CopyImageAt(int x, int y);
 
Property changes on: chrome\browser\renderer_host\render_view_host.h
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/chrome/browser/renderer_host/render_view_host.h:r21466