From aaca0583cf108fa93b17e8847f815489e7459966 Mon Sep 17 00:00:00 2001 From: "jeremy@chromium.org" Date: Fri, 19 Jun 2009 22:02:10 +0000 Subject: back out r18853 This reverts commit f2f30e9d0108f4a776672c6b29d25ed3a8ad19ad. Review URL: http://codereview.chromium.org/140013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18856 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/renderer_host/render_view_host.cc | 8 -------- chrome/browser/renderer_host/render_view_host.h | 2 -- chrome/browser/renderer_host/render_widget_host.cc | 7 ------- chrome/browser/renderer_host/render_widget_host.h | 2 -- .../browser/renderer_host/render_widget_host_view_mac.h | 10 +--------- .../browser/renderer_host/render_widget_host_view_mac.mm | 15 --------------- 6 files changed, 1 insertion(+), 43 deletions(-) (limited to 'chrome/browser/renderer_host') diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index f486cb7..d5376f44 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -1445,14 +1445,6 @@ void RenderViewHost::ForwardMouseEvent( } } -void RenderViewHost::ForwardEditCommand(const std::string& name, - const std::string& value) { - IPC::Message* message = new ViewMsg_HandleExecuteEditCommand(routing_id(), - name, - value); - Send(message); -} - void RenderViewHost::OnDebugDisconnect() { if (debugger_attached_) { debugger_attached_ = false; diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 101bc2b..be31a607 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -424,8 +424,6 @@ class RenderViewHost : public RenderWidgetHost { virtual void GotFocus(); virtual bool CanBlur() const; virtual void ForwardMouseEvent(const WebKit::WebMouseEvent& mouse_event); - virtual void ForwardEditCommand(const std::string& name, - const std::string& value); virtual gfx::Rect GetRootWindowResizerRect() const; // Creates a new RenderView with the given route id. diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index 9b18841..51d2b3b 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -382,13 +382,6 @@ void RenderWidgetHost::ForwardInputEvent(const WebInputEvent& input_event, StartHangMonitorTimeout(TimeDelta::FromMilliseconds(kHungRendererDelayMs)); } -void RenderWidgetHost::ForwardEditCommand(const std::string& name, - const std::string& value) { - // We don't need an implementation of this function here since the - // only place we use this is for the case of dropdown menus and other - // edge cases for which edit commands don't make sense. -} - void RenderWidgetHost::RendererExited() { // Clearing this flag causes us to re-create the renderer when recovering // from a crashed renderer. diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h index 783c147..c5913ef 100644 --- a/chrome/browser/renderer_host/render_widget_host.h +++ b/chrome/browser/renderer_host/render_widget_host.h @@ -239,8 +239,6 @@ class RenderWidgetHost : public IPC::Channel::Listener { virtual void ForwardMouseEvent(const WebKit::WebMouseEvent& mouse_event); void ForwardWheelEvent(const WebKit::WebMouseWheelEvent& wheel_event); void ForwardKeyboardEvent(const NativeWebKeyboardEvent& key_event); - virtual void ForwardEditCommand(const std::string& name, - const std::string& value); // Update the text direction of the focused input element and notify it to a // renderer process. diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h index cdfee6a..ab97232 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.h +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h @@ -8,33 +8,25 @@ #import #include "base/scoped_nsobject.h" -#include "base/scoped_ptr.h" #include "base/task.h" #include "base/time.h" #include "chrome/browser/cocoa/base_view.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" - #include "webkit/glue/webcursor.h" class RenderWidgetHostViewMac; -class RWHVMEditCommandHelper; @class ToolTip; -@protocol RenderWidgetHostViewMacOwner -- (RenderWidgetHostViewMac*)renderWidgetHostViewMac; -@end - // This is the view that lives in the Cocoa view hierarchy. In Windows-land, // RenderWidgetHostViewWin is both the view and the delegate. We split the roles // but that means that the view needs to own the delegate and will dispose of it // when it's removed from the view system. -@interface RenderWidgetHostViewCocoa : BaseView { +@interface RenderWidgetHostViewCocoa : BaseView { @private RenderWidgetHostViewMac* renderWidgetHostView_; BOOL canBeKeyView_; BOOL closeOnDeactivate_; - scoped_ptr editCommand_helper_; } - (void)setCanBeKeyView:(BOOL)can; diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.mm b/chrome/browser/renderer_host/render_widget_host_view_mac.mm index 893c79d..a18dd08 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm +++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm @@ -7,7 +7,6 @@ #include "base/histogram.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_trial.h" -#import "chrome/browser/cocoa/rwhvm_editcommand_helper.h" #include "chrome/browser/renderer_host/backing_store.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" @@ -363,9 +362,6 @@ void RenderWidgetHostViewMac::ShutdownHost() { - (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r { self = [super initWithFrame:NSZeroRect]; if (self != nil) { - editCommand_helper_.reset(new RWHVMEditCommandHelper); - editCommand_helper_->AddEditingSelectorsToClass([self class]); - renderWidgetHostView_ = r; canBeKeyView_ = YES; closeOnDeactivate_ = NO; @@ -513,15 +509,4 @@ void RenderWidgetHostViewMac::ShutdownHost() { return YES; } -- (BOOL)validateUserInterfaceItem:(id)item { - SEL action = [item action]; - - return editCommand_helper_->IsMenuItemEnabled(action, self); -} - -- (RenderWidgetHostViewMac*)renderWidgetHostViewMac { - return renderWidgetHostView_; -} - @end - -- cgit v1.1