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

webkit/glue/webview.h

Index: webkit/glue/webview.h
===================================================================
--- webkit/glue/webview.h	(revision 21785)
+++ webkit/glue/webview.h	(working copy)
@@ -16,6 +16,7 @@
 struct WebPoint;
 }
 
+struct MediaPlayerAction;
 struct WebPreferences;
 class GURL;
 class WebDevToolsAgent;
@@ -230,6 +231,12 @@
   virtual void SetIsTransparent(bool is_transparent) = 0;
   virtual bool GetIsTransparent() const = 0;
 
+  // Performs an action from a context menu for the node at the given
+  // location.
+  virtual void MediaPlayerActionAt(int x,
+                                   int y,
+                                   const MediaPlayerAction& action) = 0;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WebView);
 };
Property changes on: webkit\glue\webview.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/glue/webview.h:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/glue/webview.h:r21466