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

5 files changed, 10 insertions, 8 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 =
diff --git a/content/shell/renderer/test_runner/WebFrameTestProxy.h b/content/shell/renderer/test_runner/WebFrameTestProxy.h
index 238712b..07aceb6 100644
--- a/content/shell/renderer/test_runner/WebFrameTestProxy.h
+++ b/content/shell/renderer/test_runner/WebFrameTestProxy.h
@@ -92,6 +92,10 @@ public:
     {
         Base::didFinishLoad(frame);
     }
+    virtual void didChangeSelection(bool is_selection_empty) {
+        m_baseProxy->didChangeSelection(is_selection_empty);
+        Base::didChangeSelection(is_selection_empty);
+    }
     virtual void showContextMenu(const blink::WebContextMenuData& contextMenuData) {
         m_baseProxy->showContextMenu(Base::GetWebFrame(), contextMenuData);
         Base::showContextMenu(contextMenuData);
diff --git a/content/shell/renderer/test_runner/WebTestProxy.h b/content/shell/renderer/test_runner/WebTestProxy.h
index ea10c5a..fdb2043 100644
--- a/content/shell/renderer/test_runner/WebTestProxy.h
+++ b/content/shell/renderer/test_runner/WebTestProxy.h
@@ -288,11 +288,6 @@ public:
         WebTestProxyBase::startDragging(frame, data, mask, image, point);
         // Don't forward this call to Base because we don't want to do a real drag-and-drop.
     }
-    virtual void didChangeSelection(bool isEmptySelection)
-    {
-        WebTestProxyBase::didChangeSelection(isEmptySelection);
-        Base::didChangeSelection(isEmptySelection);
-    }
     virtual void didChangeContents()
     {
         WebTestProxyBase::didChangeContents();