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

webkit/tools/test_shell/test_webview_delegate.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "config.h"
 
@@ skipping 556 matching lines @@
     //DWORD effect;
     //HRESULT res = DoDragDrop(drop_data.data_object, drag_delegate_.get(),
     //                         ok_effect, &effect);
     //DCHECK(DRAGDROP_S_DROP == res || DRAGDROP_S_CANCEL == res);
   }
   webview->DragSourceSystemDragEnded();
 }
 
 void TestWebViewDelegate::ShowContextMenu(
     WebView* webview,
-    ContextNode node,
+    ContextNodeType node_type,
     int x,
     int y,
     const GURL& link_url,
     const GURL& image_url,
     const GURL& page_url,
     const GURL& frame_url,
     const ContextMenuMediaParams& media_params,
     const std::wstring& selection_text,
     const std::wstring& misspelled_word,
     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);
 }
 
 // The output from these methods in layout test mode should match that
 // expected by the layout tests.  See EditingDelegate.m in DumpRenderTree.
 bool TestWebViewDelegate::ShouldBeginEditing(WebView* webview,
                                              std::wstring range) {
   if (shell_->ShouldDumpEditingCallbacks()) {
     std::string utf8 = WideToUTF8(range);
     printf("EDITING DELEGATE: shouldBeginEditingInDOMRange:%s\n",
@@ skipping 323 matching lines @@
       return L"main frame \"" + name + L"\"";
     else
       return L"main frame";
   } else {
     if (name.length())
       return L"frame \"" + name + L"\"";
     else
       return L"frame (anonymous)";
   }
 }