diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 22:34:15 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 22:34:15 +0000 |
| commit | 4ee6462e9a2e01e57ccd98eececfb20d5cb0262b (patch) | |
| tree | a5e0f4fe99d162848603044075843f69e469299d /content/shell/browser | |
| parent | 466f87d78f0aa46c6f0b6444b4f8e2a527dd4b4e (diff) | |
| download | chromium_src-4ee6462e9a2e01e57ccd98eececfb20d5cb0262b.zip chromium_src-4ee6462e9a2e01e57ccd98eececfb20d5cb0262b.tar.gz chromium_src-4ee6462e9a2e01e57ccd98eececfb20d5cb0262b.tar.bz2 | |
Move selection related code to RenderFrame. Also finish moving the rest of the edit commands to RenderFrame.
BUG=304341
R=nasko@chromium.org
Review URL: https://codereview.chromium.org/207253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258697 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/browser')
3 files changed, 6 insertions, 3 deletions
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 9b4ac3f..f3cebd9 100644 --- a/content/shell/browser/shell_web_contents_view_delegate_gtk.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_gtk.cc @@ -239,7 +239,8 @@ void ShellWebContentsViewDelegate::OnPasteMenuActivated(GtkWidget* widget) { } void ShellWebContentsViewDelegate::OnDeleteMenuActivated(GtkWidget* widget) { - web_contents_->GetRenderViewHost()->Delete(); + if (frame) + frame->Delete(); } void ShellWebContentsViewDelegate::OnInspectMenuActivated(GtkWidget* widget) { 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 91541c9..7dd810c 100644 --- a/content/shell/browser/shell_web_contents_view_delegate_mac.mm +++ b/content/shell/browser/shell_web_contents_view_delegate_mac.mm @@ -238,7 +238,8 @@ void ShellWebContentsViewDelegate::ActionPerformed(int tag) { frame->Paste(); break; case ShellContextMenuItemDeleteTag: - web_contents_->GetRenderViewHost()->Delete(); + if (frame) + frame->Delete(); break; case ShellContextMenuItemOpenLinkTag: { ShellBrowserContext* browser_context = 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 177cdb2..ce86db2 100644 --- a/content/shell/browser/shell_web_contents_view_delegate_win.cc +++ b/content/shell/browser/shell_web_contents_view_delegate_win.cc @@ -206,7 +206,8 @@ void ShellWebContentsViewDelegate::MenuItemSelected(int selection) { frame->Paste(); break; case ShellContextMenuItemDeleteId: - web_contents_->GetRenderViewHost()->Delete(); + if (frame) + frame->Delete(); break; case ShellContextMenuItemOpenLinkId: { ShellBrowserContext* browser_context = |