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

chrome/renderer/render_view.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_RENDERER_RENDER_VIEW_H_
 #define CHROME_RENDERER_RENDER_VIEW_H_
 
 #include <string>
 #include <queue>
 #include <vector>
@@ skipping 245 matching lines @@
                        const GURL& referrer,
                        WebKit::WebNavigationPolicy policy);
   virtual void DidDownloadImage(int id,
                                 const GURL& image_url,
                                 bool errored,
                                 const SkBitmap& image);
   virtual GURL GetAlternateErrorPageURL(const GURL& failedURL,
                                         ErrorPageType error_type);
 
   virtual void ShowContextMenu(WebView* webview,
-                               ContextNode node,
+                               ContextNodeType node_type,
                                int x,
                                int y,
                                const GURL& link_url,
                                const GURL& src_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,
@@ skipping 255 matching lines @@
 
   void OnDragSourceEndedOrMoved(const gfx::Point& client_point,
                                 const gfx::Point& screen_point,
                                 bool ended, bool cancelled);
   void OnDragSourceSystemDragEnded();
   void OnInstallMissingPlugin();
   void OnFileChooserResponse(const std::vector<FilePath>& file_names);
   void OnEnableViewSourceMode();
   void OnEnableIntrinsicWidthChangedMode();
   void OnSetRendererPrefs(const RendererPreferences& renderer_prefs);
+  void OnMediaPlayerActionAt(int x,
+                             int y,
+                             const MediaPlayerAction& action);
   void OnUpdateBackForwardListCount(int back_list_count,
                                     int forward_list_count);
   void OnGetAccessibilityInfo(
       const webkit_glue::WebAccessibility::InParams& in_params,
       webkit_glue::WebAccessibility::OutParams* out_params);
   void OnClearAccessibilityInfo(int acc_obj_id, bool clear_all);
 
   void OnExtensionMessageInvoke(const std::string& function_name,
                                 const ListValue& args);
 
@@ skipping 254 matching lines @@
   // PrintWebViewHelper handles printing.  Note that this object is constructed
   // when printing for the first time but only destroyed with the RenderView.
   scoped_ptr<PrintWebViewHelper> print_helper_;
 
   RendererPreferences renderer_preferences_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderView);
 };
 
 #endif  // CHROME_RENDERER_RENDER_VIEW_H_