| Index: chrome/renderer/render_view.h
|
| ===================================================================
|
| --- chrome/renderer/render_view.h (revision 21785)
|
| +++ chrome/renderer/render_view.h (working copy)
|
| @@ -263,7 +263,7 @@
|
| ErrorPageType error_type);
|
|
|
| virtual void ShowContextMenu(WebView* webview,
|
| - ContextNode node,
|
| + ContextNodeType node_type,
|
| int x,
|
| int y,
|
| const GURL& link_url,
|
| @@ -539,6 +539,9 @@
|
| 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(
|
|
|
| Property changes on: chrome\renderer\render_view.h
|
| ___________________________________________________________________
|
| Modified: svn:mergeinfo
|
| Merged /trunk/src/chrome/renderer/render_view.h:r21466
|
|
|
|
|