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

webkit/tools/test_shell/test_webview_delegate.h

Index: webkit/tools/test_shell/test_webview_delegate.h
===================================================================
--- webkit/tools/test_shell/test_webview_delegate.h	(revision 21785)
+++ webkit/tools/test_shell/test_webview_delegate.h	(working copy)
@@ -45,15 +45,15 @@
                             public WebViewDelegate {
  public:
   struct CapturedContextMenuEvent {
-    CapturedContextMenuEvent(ContextNode in_node,
+    CapturedContextMenuEvent(ContextNodeType in_node_type,
                              int in_x,
                              int in_y)
-      : node(in_node),
+      : node_type(in_node_type),
         x(in_x),
         y(in_y) {
     }
 
-    ContextNode node;
+    ContextNodeType node_type;
     int x;
     int y;
   };
@@ -130,7 +130,7 @@
   virtual void StartDragging(WebView* webview,
                              const WebKit::WebDragData& drag_data);
   virtual void ShowContextMenu(WebView* webview,
-                               ContextNode node,
+                               ContextNodeType node_type,
                                int x,
                                int y,
                                const GURL& link_url,
Property changes on: webkit\tools\test_shell\test_webview_delegate.h
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/src/webkit/tools/test_shell/test_webview_delegate.h:r3734-4217,4606-5108,5177-5263
   Merged /trunk/src/webkit/tools/test_shell/test_webview_delegate.h:r21466