Add a contextual menu command for 'Paste and plain text' (or 'Paste and Match Style' on Mac)

MainMenu.xib details:
- Change 'Paste and Match Style' to send the pasteAndMatchStyle: message.

BUG=25238
TEST=In an editable field on a web page, right-click to 'Paste as plain text'.
Review URL: http://codereview.chromium.org/8234006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105710 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 16 insertions, 11 deletions

diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc
index 1aa93ca..43639bf 100644
--- a/content/browser/renderer_host/render_widget_host.cc
+++ b/content/browser/renderer_host/render_widget_host.cc
@@ -1377,6 +1377,11 @@ void RenderWidgetHost::Paste() {
   UserMetrics::RecordAction(UserMetricsAction("Paste"));
 }
 
+void RenderWidgetHost::PasteAndMatchStyle() {
+  Send(new ViewMsg_PasteAndMatchStyle(routing_id()));
+  UserMetrics::RecordAction(UserMetricsAction("PasteAndMatchStyle"));
+}
+
 void RenderWidgetHost::Delete() {
   Send(new ViewMsg_Delete(routing_id()));
   UserMetrics::RecordAction(UserMetricsAction("DeleteSelection"));
diff --git a/content/browser/renderer_host/render_widget_host.h b/content/browser/renderer_host/render_widget_host.h
index c31a16d..25cec88 100644
--- a/content/browser/renderer_host/render_widget_host.h
+++ b/content/browser/renderer_host/render_widget_host.h
@@ -419,6 +419,7 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Channel::Listener,
   void Copy();
   void CopyToFindPboard();
   void Paste();
+  void PasteAndMatchStyle();
   void Delete();
   void SelectAll();
 
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 587f55a..b5dafbf 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -1911,7 +1911,7 @@ void RenderWidgetHostViewMac::SetTextInputActive(bool active) {
       action == @selector(copy:) ||
       action == @selector(copyToFindPboard:) ||
       action == @selector(paste:) ||
-      action == @selector(pasteAsPlainText:)) {
+      action == @selector(pasteAndMatchStyle:)) {
     return renderWidgetHostView_->render_widget_host_->IsRenderView();
   }
 
@@ -2566,50 +2566,49 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
 - (void)undo:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
     static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
-      Undo();
+        Undo();
   }
 }
 
 - (void)redo:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
     static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
-      Redo();
+        Redo();
   }
 }
 
 - (void)cut:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
     static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
-      Cut();
+        Cut();
   }
 }
 
 - (void)copy:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
     static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
-      Copy();
+        Copy();
   }
 }
 
 - (void)copyToFindPboard:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
     static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
-      CopyToFindPboard();
+        CopyToFindPboard();
   }
 }
 
 - (void)paste:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
     static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
-      Paste();
+        Paste();
   }
 }
 
-- (void)pasteAsPlainText:(id)sender {
+- (void)pasteAndMatchStyle:(id)sender {
   if (renderWidgetHostView_->render_widget_host_->IsRenderView()) {
-      RenderWidgetHost* rwh = renderWidgetHostView_->render_widget_host_;
-    rwh->Send(new ViewMsg_ExecuteEditCommand(
-        rwh->routing_id(), "PasteAndMatchStyle", ""));
+    static_cast<RenderViewHost*>(renderWidgetHostView_->render_widget_host_)->
+        PasteAndMatchStyle();
   }
 }