diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 00:46:42 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-31 00:46:42 +0000 |
| commit | a09d53ce62c9f35c9816a24e3b940ebbc33fb518 (patch) | |
| tree | cd72bf77526f03ca6cf28109f2512a810891989a /content/shell | |
| parent | e730aed65f8ea2d5f5f7ec51f01462d7c21b3012 (diff) | |
| download | chromium_src-a09d53ce62c9f35c9816a24e3b940ebbc33fb518.zip chromium_src-a09d53ce62c9f35c9816a24e3b940ebbc33fb518.tar.gz chromium_src-a09d53ce62c9f35c9816a24e3b940ebbc33fb518.tar.bz2 | |
Start moving context menu code to RenderFrame.
The selection code will have to move as well. That will happen in future changes.
BUG=304341
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/130773004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
5 files changed, 6 insertions, 1 deletions
diff --git a/content/shell/browser/shell_web_contents_view_delegate.h b/content/shell/browser/shell_web_contents_view_delegate.h index 86d97b4..7233e13 100644 --- a/content/shell/browser/shell_web_contents_view_delegate.h +++ b/content/shell/browser/shell_web_contents_view_delegate.h @@ -22,7 +22,8 @@ class ShellWebContentsViewDelegate : public WebContentsViewDelegate { virtual ~ShellWebContentsViewDelegate(); // Overridden from WebContentsViewDelegate: - virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE; + virtual void ShowContextMenu(RenderFrameHost* render_frame_host, + const ContextMenuParams& params) OVERRIDE; virtual WebDragDestDelegate* GetDragDestDelegate() OVERRIDE; #if defined(TOOLKIT_GTK) diff --git a/content/shell/browser/shell_web_contents_view_delegate_android.cc b/content/shell/browser/shell_web_contents_view_delegate_android.cc index 3da5475..fb4a3dc 100644 --- a/content/shell/browser/shell_web_contents_view_delegate_android.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_android.cc @@ -28,6 +28,7 @@ ShellWebContentsViewDelegate::~ShellWebContentsViewDelegate() { } void ShellWebContentsViewDelegate::ShowContextMenu( + RenderFrameHost* render_frame_host, const ContextMenuParams& params) { if (params.is_editable && params.selection_text.empty()) { content::ContentViewCore* content_view_core = diff --git a/content/shell/browser/shell_web_contents_view_delegate_gtk.cc b/content/shell/browser/shell_web_contents_view_delegate_gtk.cc index 5020720..e3b3222 100644 --- a/content/shell/browser/shell_web_contents_view_delegate_gtk.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_gtk.cc @@ -42,6 +42,7 @@ ShellWebContentsViewDelegate::~ShellWebContentsViewDelegate() { } void ShellWebContentsViewDelegate::ShowContextMenu( + RenderFrameHost* render_frame_host, const ContextMenuParams& params) { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) return; diff --git a/content/shell/browser/shell_web_contents_view_delegate_mac.mm b/content/shell/browser/shell_web_contents_view_delegate_mac.mm index 1d01f90..dc2045c 100644 --- a/content/shell/browser/shell_web_contents_view_delegate_mac.mm +++ b/content/shell/browser/shell_web_contents_view_delegate_mac.mm @@ -93,6 +93,7 @@ ShellWebContentsViewDelegate::~ShellWebContentsViewDelegate() { } void ShellWebContentsViewDelegate::ShowContextMenu( + RenderFrameHost* render_frame_host, const ContextMenuParams& params) { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) return; diff --git a/content/shell/browser/shell_web_contents_view_delegate_win.cc b/content/shell/browser/shell_web_contents_view_delegate_win.cc index 63223f4..68ab07c 100644 --- a/content/shell/browser/shell_web_contents_view_delegate_win.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_win.cc @@ -70,6 +70,7 @@ ShellWebContentsViewDelegate::~ShellWebContentsViewDelegate() { } void ShellWebContentsViewDelegate::ShowContextMenu( + RenderFrameHost* render_frame_host, const ContextMenuParams& params) { if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) return; |