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

webkit/tools/test_shell/test_webview_delegate.cc

Index: webkit/tools/test_shell/test_webview_delegate.cc
===================================================================
--- webkit/tools/test_shell/test_webview_delegate.cc	(revision 21785)
+++ webkit/tools/test_shell/test_webview_delegate.cc	(working copy)
@@ -574,7 +574,7 @@
 
 void TestWebViewDelegate::ShowContextMenu(
     WebView* webview,
-    ContextNode node,
+    ContextNodeType node_type,
     int x,
     int y,
     const GURL& link_url,
@@ -587,7 +587,7 @@
     int edit_flags,
     const std::string& security_info,
     const std::string& frame_charset) {
-  CapturedContextMenuEvent context(node, x, y);
+  CapturedContextMenuEvent context(node_type, x, y);
   captured_context_menu_events_.push_back(context);
 }
 
Property changes on: webkit\tools\test_shell\test_webview_delegate.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/webkit/tools/test_shell/test_webview_delegate.cc:r21466