summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 20:13:54 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-10 20:13:54 +0000
commited8896a08e7cd71e1a1f93f911006a5ce5242871 (patch)
treecb30e4409906a3ec48ca272330fb73f259f6923c
parent6c760532bfe8e8d20cc97602a6a031858a7c6f8f (diff)
downloadchromium_src-ed8896a08e7cd71e1a1f93f911006a5ce5242871.zip
chromium_src-ed8896a08e7cd71e1a1f93f911006a5ce5242871.tar.gz
chromium_src-ed8896a08e7cd71e1a1f93f911006a5ce5242871.tar.bz2
Switch the Mac accessor method name to match the GTK one (consistency is good).
Review URL: http://codereview.chromium.org/21221 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9501 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_mac.h2
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_mac.mm4
-rw-r--r--chrome/browser/tab_contents/web_contents_view_mac.mm2
3 files changed, 2 insertions, 6 deletions
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 d7d1e4d..1ca398c 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -51,7 +51,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
base::TimeTicks& whiteout_start_time() { return whiteout_start_time_; }
- gfx::NativeView GetNativeView() const;
+ gfx::NativeView native_view() const { return cocoa_view_; }
// Implementation of RenderWidgetHostView:
virtual RenderWidgetHost* GetRenderWidgetHost() const;
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 9e46373..dfb290e 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -46,10 +46,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget)
RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
}
-gfx::NativeView RenderWidgetHostViewMac::GetNativeView() const {
- return cocoa_view_;
-}
-
///////////////////////////////////////////////////////////////////////////////
// RenderWidgetHostViewMac, RenderWidgetHostView implementation:
diff --git a/chrome/browser/tab_contents/web_contents_view_mac.mm b/chrome/browser/tab_contents/web_contents_view_mac.mm
index 5f6d113..2026b00 100644
--- a/chrome/browser/tab_contents/web_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/web_contents_view_mac.mm
@@ -45,7 +45,7 @@ RenderWidgetHostView* WebContentsViewMac::CreateViewForWidget(
// Fancy layout comes later; for now just make it our size and resize it
// with us.
- NSView* view_view = view->GetNativeView();
+ NSView* view_view = view->native_view();
[cocoa_view_.get() addSubview:view_view];
[view_view setFrame:[cocoa_view_.get() bounds]];
[view_view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];