| Index: chrome/browser/tab_contents/render_view_context_menu.h
|
| ===================================================================
|
| --- chrome/browser/tab_contents/render_view_context_menu.h (revision 21785)
|
| +++ chrome/browser/tab_contents/render_view_context_menu.h (working copy)
|
| @@ -25,7 +25,7 @@
|
| void Init();
|
|
|
| protected:
|
| - void InitMenu(ContextNode node, ContextMenuMediaParams media_params);
|
| + void InitMenu(ContextNodeType node, ContextMenuMediaParams media_params);
|
|
|
| // Functions to be implemented by platform-specific subclasses ---------------
|
|
|
| @@ -101,6 +101,8 @@
|
| void WriteTextToClipboard(const string16& text);
|
| void WriteURLToClipboard(const GURL& url);
|
|
|
| + void MediaPlayerActionAt(int x, int y, const MediaPlayerAction& action);
|
| +
|
| bool IsDevCommandEnabled(int id) const;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderViewContextMenu);
|
|
|
| Property changes on: chrome\browser\tab_contents\render_view_context_menu.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/chrome/browser/tab_contents/render_view_context_menu.h:r21466
|
|
|
|
|