summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 22:37:15 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-01 22:37:15 +0000
commite232dc8723baff7001cb8b4e85019fc02a6d81ca (patch)
treee91cdeaa26187faad0befa9c05ce59a735d70243
parent0a2bafc6d43e726e569fc9a2deef078880081a60 (diff)
downloadchromium_src-e232dc8723baff7001cb8b4e85019fc02a6d81ca.zip
chromium_src-e232dc8723baff7001cb8b4e85019fc02a6d81ca.tar.gz
chromium_src-e232dc8723baff7001cb8b4e85019fc02a6d81ca.tar.bz2
Fix delegate syntax.
BUG=none TEST=none Review URL: http://codereview.chromium.org/9320020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120120 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac.h6
-rw-r--r--content/browser/renderer_host/render_widget_host_view_mac.mm6
3 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm
index 4e91c6a..d6a2db7 100644
--- a/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/moving_to_content/tab_contents_view_mac.mm
@@ -107,7 +107,7 @@ RenderWidgetHostView* TabContentsViewMac::CreateViewForWidget(
ChromeRenderWidgetHostViewMacDelegate* rw_delegate =
[[ChromeRenderWidgetHostViewMacDelegate alloc]
initWithRenderWidgetHost:render_widget_host];
- view->SetDelegate((RenderWidgetHostViewMacDelegate*)rw_delegate);
+ view->SetDelegate(rw_delegate);
// Fancy layout comes later; for now just make it our size and resize it
// with us. In case there are other siblings of the content area, we want
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 1c39904..94b1598 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -22,7 +22,7 @@
@class AcceleratedPluginView;
class RenderWidgetHostViewMac;
-@class RenderWidgetHostViewMacDelegate;
+@protocol RenderWidgetHostViewMacDelegate;
class RenderWidgetHostViewMacEditCommandHelper;
@class ToolTip;
@@ -40,7 +40,7 @@ class RenderWidgetHostViewMacEditCommandHelper;
BrowserAccessibilityDelegateCocoa> {
@private
scoped_ptr<RenderWidgetHostViewMac> renderWidgetHostView_;
- RenderWidgetHostViewMacDelegate* delegate_; // weak
+ NSObject<RenderWidgetHostViewMacDelegate>* delegate_; // weak
BOOL canBeKeyView_;
BOOL takesFocusOnlyOnMouseDown_;
BOOL closeOnDeactivate_;
@@ -168,7 +168,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
RenderWidgetHostViewCocoa* cocoa_view() const { return cocoa_view_; }
- void SetDelegate(RenderWidgetHostViewMacDelegate* delegate);
+ void SetDelegate(NSObject<RenderWidgetHostViewMacDelegate>* delegate);
// Implementation of RenderWidgetHostView:
virtual void InitAsChild(gfx::NativeView parent_view) OVERRIDE;
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 9fc8dec..0ca290c 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -102,7 +102,7 @@ static inline int ToWebKitModifiers(NSUInteger flags) {
+ (BOOL)shouldAutohideCursorForEvent:(NSEvent*)event;
- (id)initWithRenderWidgetHostViewMac:(RenderWidgetHostViewMac*)r;
-- (void)setRWHVDelegate:(RenderWidgetHostViewMacDelegate*)delegate;
+- (void)setRWHVDelegate:(NSObject<RenderWidgetHostViewMacDelegate>*)delegate;
- (void)gotUnhandledWheelEvent;
- (void)scrollOffsetPinnedToLeft:(BOOL)left toRight:(BOOL)right;
- (void)setHasHorizontalScrollbar:(BOOL)has_horizontal_scrollbar;
@@ -253,7 +253,7 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
}
void RenderWidgetHostViewMac::SetDelegate(
- RenderWidgetHostViewMacDelegate* delegate) {
+ NSObject<RenderWidgetHostViewMacDelegate>* delegate) {
[cocoa_view_ setRWHVDelegate:delegate];
}
@@ -1176,7 +1176,7 @@ void RenderWidgetHostViewMac::SetTextInputActive(bool active) {
[super dealloc];
}
-- (void)setRWHVDelegate:(RenderWidgetHostViewMacDelegate*)delegate {
+- (void)setRWHVDelegate:(NSObject<RenderWidgetHostViewMacDelegate>*)delegate {
delegate_ = delegate;
}