plugins: rename GetPluginNativeView to GetNativeView.

That's what the function does, and some callers that had nothing to do with
plugins were calling GetPluginNativeView.

Review URL: http://codereview.chromium.org/118094

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

16 files changed, 30 insertions, 31 deletions

diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 56ea409..0c19b07 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -179,7 +179,7 @@ bool RenderViewHost::CreateRenderView() {
   modal_dialog_event.event = modal_dialog_event_handle;
 #endif
 
-  Send(new ViewMsg_New(GetPluginNativeViewId(),
+  Send(new ViewMsg_New(GetNativeViewId(),
                        modal_dialog_event,
                        delegate_->GetWebkitPrefs(),
                        routing_id()));
diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc
index 36e6085..dbd4cfd 100644
--- a/chrome/browser/renderer_host/render_widget_host.cc
+++ b/chrome/browser/renderer_host/render_widget_host.cc
@@ -77,9 +77,9 @@ RenderWidgetHost::~RenderWidgetHost() {
   process_->Release(routing_id_);
 }
 
-gfx::NativeViewId RenderWidgetHost::GetPluginNativeViewId() {
+gfx::NativeViewId RenderWidgetHost::GetNativeViewId() {
   if (view_)
-    return gfx::IdFromNativeView(view_->GetPluginNativeView());
+    return gfx::IdFromNativeView(view_->GetNativeView());
   return NULL;
 }
 
@@ -89,7 +89,7 @@ void RenderWidgetHost::Init() {
   renderer_initialized_ = true;
 
   // Send the ack along with the information on placement.
-  Send(new ViewMsg_CreatingNew_ACK(routing_id_, GetPluginNativeViewId()));
+  Send(new ViewMsg_CreatingNew_ACK(routing_id_, GetNativeViewId()));
   WasResized();
 }
 
diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
index 8936e48..8ac2376 100644
--- a/chrome/browser/renderer_host/render_widget_host.h
+++ b/chrome/browser/renderer_host/render_widget_host.h
@@ -268,8 +268,9 @@ class RenderWidgetHost : public IPC::Channel::Listener {
   // consistent if a new renderer is created.
   void RendererExited();
 
-  // Retrieves the native view used to contain plugins.
-  gfx::NativeViewId GetPluginNativeViewId();
+  // Retrieves an id the renderer can use to refer to its view.
+  // This is used for various IPC messages, including plugins.
+  gfx::NativeViewId GetNativeViewId();
 
   // Called when we an InputEvent was not processed by the renderer. This is
   // overridden by RenderView to send upwards to its delegate.
diff --git a/chrome/browser/renderer_host/render_widget_host_view.h b/chrome/browser/renderer_host/render_widget_host_view.h
index 979f22b..41eecf6 100644
--- a/chrome/browser/renderer_host/render_widget_host_view.h
+++ b/chrome/browser/renderer_host/render_widget_host_view.h
@@ -64,8 +64,9 @@ class RenderWidgetHostView {
   // Tells the View to size itself to the specified size.
   virtual void SetSize(const gfx::Size& size) = 0;
 
-  // Retrieves the native view used to contain plugins.
-  virtual gfx::NativeView GetPluginNativeView() = 0;
+  // Retrieves the native view used to contain plugins and identify the
+  // renderer in IPC messages.
+  virtual gfx::NativeView GetNativeView() = 0;
 
   // Moves all plugin windows as described in the given list.
   virtual void MovePluginWindows(
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
index 61dd327..c67d40b 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc
@@ -219,7 +219,7 @@ void RenderWidgetHostViewGtk::InitAsChild() {
 void RenderWidgetHostViewGtk::InitAsPopup(
     RenderWidgetHostView* parent_host_view, const gfx::Rect& pos) {
   parent_host_view_ = parent_host_view;
-  parent_ = parent_host_view->GetPluginNativeView();
+  parent_ = parent_host_view->GetNativeView();
   GtkWidget* popup = gtk_window_new(GTK_WINDOW_POPUP);
   view_.Own(RenderWidgetHostViewGtkWidget::CreateNewWidget(this));
   gtk_container_add(GTK_CONTAINER(popup), view_.get());
@@ -289,10 +289,7 @@ void RenderWidgetHostViewGtk::SetSize(const gfx::Size& size) {
     gtk_widget_set_size_request(view_.get(), size.width(), size.height());
 }
 
-gfx::NativeView RenderWidgetHostViewGtk::GetPluginNativeView() {
-  // TODO(port): We need to pass some widget pointer out here because the
-  // renderer echos it back to us when it asks for GetScreenInfo. However, we
-  // should probably be passing the top-level window or some such instead.
+gfx::NativeView RenderWidgetHostViewGtk::GetNativeView() {
   return view_.get();
 }
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.h b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
index 90c5281..fdd5a97 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_gtk.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.h
@@ -39,7 +39,7 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   void DidBecomeSelected();
   void WasHidden();
   void SetSize(const gfx::Size& size);
-  gfx::NativeView GetPluginNativeView();
+  gfx::NativeView GetNativeView();
   void MovePluginWindows(
       const std::vector<WebPluginGeometry>& plugin_window_moves);
   void Focus();
@@ -86,7 +86,7 @@ class RenderWidgetHostViewGtk : public RenderWidgetHostView {
   // Our parent widget.
   RenderWidgetHostView* parent_host_view_;
   // The native view of our parent, equivalent to
-  // parent_host_view_->GetPluginNativeView().
+  // parent_host_view_->GetNativeView().
   GtkWidget* parent_;
   // This is true when we are currently painting and thus should handle extra
   // paint requests by expanding the invalid rect rather than actually
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 e04b822..b663cf4 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -64,7 +64,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
   virtual void DidBecomeSelected();
   virtual void WasHidden();
   virtual void SetSize(const gfx::Size& size);
-  virtual gfx::NativeView GetPluginNativeView();
+  virtual gfx::NativeView GetNativeView();
   virtual void MovePluginWindows(
       const std::vector<WebPluginGeometry>& plugin_window_moves);
   virtual void Focus();
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 0b141d8..f8e7092 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.mm
@@ -63,7 +63,7 @@ RenderWidgetHostViewMac::~RenderWidgetHostViewMac() {
 void RenderWidgetHostViewMac::InitAsPopup(
     RenderWidgetHostView* parent_host_view,
     const gfx::Rect& pos) {
-  [parent_host_view->GetPluginNativeView() addSubview:cocoa_view_];
+  [parent_host_view->GetNativeView() addSubview:cocoa_view_];
   [cocoa_view_ setCloseOnDeactivate:YES];
   [cocoa_view_ setCanBeKeyView:activatable_ ? YES : NO];
 
@@ -124,7 +124,7 @@ void RenderWidgetHostViewMac::SetSize(const gfx::Size& size) {
   // the size upon creation. http://crbug.com/8285.
 }
 
-gfx::NativeView RenderWidgetHostViewMac::GetPluginNativeView() {
+gfx::NativeView RenderWidgetHostViewMac::GetNativeView() {
   return native_view();
 }
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc
index f6fa297..8ac108c 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc
@@ -223,7 +223,7 @@ RenderWidgetHostViewWin::~RenderWidgetHostViewWin() {
 
 void RenderWidgetHostViewWin::InitAsPopup(
     RenderWidgetHostView* parent_host_view, const gfx::Rect& pos) {
-  parent_hwnd_ = parent_host_view->GetPluginNativeView();
+  parent_hwnd_ = parent_host_view->GetNativeView();
   close_on_deactivate_ = true;
   Create(parent_hwnd_, NULL, NULL, WS_POPUP, WS_EX_TOOLWINDOW);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
@@ -277,7 +277,7 @@ void RenderWidgetHostViewWin::SetSize(const gfx::Size& size) {
   EnsureTooltip();
 }
 
-gfx::NativeView RenderWidgetHostViewWin::GetPluginNativeView() {
+gfx::NativeView RenderWidgetHostViewWin::GetNativeView() {
   return m_hWnd;
 }
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.h b/chrome/browser/renderer_host/render_widget_host_view_win.h
index 5b80f09..751dbb2 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_win.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_win.h
@@ -112,7 +112,7 @@ class RenderWidgetHostViewWin :
   virtual void DidBecomeSelected();
   virtual void WasHidden();
   virtual void SetSize(const gfx::Size& size);
-  virtual gfx::NativeView GetPluginNativeView();
+  virtual gfx::NativeView GetNativeView();
   virtual void MovePluginWindows(
       const std::vector<WebPluginGeometry>& plugin_window_moves);
   virtual void Focus();
diff --git a/chrome/browser/renderer_host/test_render_view_host.h b/chrome/browser/renderer_host/test_render_view_host.h
index 6088301..cadcc1b 100644
--- a/chrome/browser/renderer_host/test_render_view_host.h
+++ b/chrome/browser/renderer_host/test_render_view_host.h
@@ -46,7 +46,7 @@ class TestRenderWidgetHostView : public RenderWidgetHostView {
   virtual void DidBecomeSelected() {}
   virtual void WasHidden() {}
   virtual void SetSize(const gfx::Size& size) {}
-  virtual gfx::NativeView GetPluginNativeView() { return NULL; }
+  virtual gfx::NativeView GetNativeView() { return NULL; }
   virtual void MovePluginWindows(
     const std::vector<WebPluginGeometry>& plugin_window_moves) {}
 #if defined(OS_WIN)
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
index e15d4db..d6a537a 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
@@ -159,7 +159,7 @@ gfx::NativeView TabContentsViewGtk::GetNativeView() const {
 gfx::NativeView TabContentsViewGtk::GetContentNativeView() const {
   if (!tab_contents()->render_widget_host_view())
     return NULL;
-  return tab_contents()->render_widget_host_view()->GetPluginNativeView();
+  return tab_contents()->render_widget_host_view()->GetNativeView();
 }
 
 
diff --git a/chrome/browser/tab_contents/tab_contents_view_mac.mm b/chrome/browser/tab_contents/tab_contents_view_mac.mm
index 5142088..4cd0f57 100644
--- a/chrome/browser/tab_contents/tab_contents_view_mac.mm
+++ b/chrome/browser/tab_contents/tab_contents_view_mac.mm
@@ -66,7 +66,7 @@ gfx::NativeView TabContentsViewMac::GetNativeView() const {
 gfx::NativeView TabContentsViewMac::GetContentNativeView() const {
   if (!tab_contents()->render_widget_host_view())
     return NULL;
-  return tab_contents()->render_widget_host_view()->GetPluginNativeView();
+  return tab_contents()->render_widget_host_view()->GetNativeView();
 }
 
 gfx::NativeWindow TabContentsViewMac::GetTopLevelNativeWindow() const {
diff --git a/chrome/browser/tab_contents/tab_contents_view_win.cc b/chrome/browser/tab_contents/tab_contents_view_win.cc
index fac170d..15481b5 100644
--- a/chrome/browser/tab_contents/tab_contents_view_win.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_win.cc
@@ -106,7 +106,7 @@ gfx::NativeView TabContentsViewWin::GetNativeView() const {
 gfx::NativeView TabContentsViewWin::GetContentNativeView() const {
   if (!tab_contents()->render_widget_host_view())
     return NULL;
-  return tab_contents()->render_widget_host_view()->GetPluginNativeView();
+  return tab_contents()->render_widget_host_view()->GetNativeView();
 }
 
 gfx::NativeWindow TabContentsViewWin::GetTopLevelNativeWindow() const {
@@ -213,7 +213,7 @@ void TabContentsViewWin::SetPageTitle(const std::wstring& title) {
     // TODO(brettw) this call seems messy the way it reaches into the widget
     // view, and I'm not sure it's necessary. Maybe we should just remove it.
     ::SetWindowText(
-        tab_contents()->render_widget_host_view()->GetPluginNativeView(),
+        tab_contents()->render_widget_host_view()->GetNativeView(),
         title.c_str());
   }
 }
@@ -483,7 +483,7 @@ void TabContentsViewWin::OnSetFocus(HWND window) {
   // messages during the destruction process after it has been destroyed.
   if (tab_contents()->render_widget_host_view()) {
     HWND inner_hwnd =
-        tab_contents()->render_widget_host_view()->GetPluginNativeView();
+        tab_contents()->render_widget_host_view()->GetNativeView();
     if (::IsWindow(inner_hwnd))
       ::SetFocus(inner_hwnd);
   }
diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc
index c56d062..3ff5d2e 100644
--- a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc
+++ b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc
@@ -85,12 +85,12 @@ void NativeTabContentsContainerGtk::RenderViewHostChanged(
 #if defined(OS_WIN)
   if (old_host && old_host->view()) {
     views::FocusManager::UninstallFocusSubclass(
-        old_host->view()->GetPluginNativeView());
+        old_host->view()->GetNativeView());
   }
 
   if (new_host && new_host->view()) {
     views::FocusManager::InstallFocusSubclass(
-        new_host->view()->GetPluginNativeView(), this);
+        new_host->view()->GetNativeView(), this);
   }
 
   // If we are focused, we need to pass the focus to the new RenderViewHost.
diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc
index 8dccc4c..eaecb12 100644
--- a/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc
+++ b/chrome/browser/views/tab_contents/native_tab_contents_container_win.cc
@@ -74,12 +74,12 @@ void NativeTabContentsContainerWin::RenderViewHostChanged(
     RenderViewHost* new_host) {
   if (old_host && old_host->view()) {
     views::FocusManager::UninstallFocusSubclass(
-        old_host->view()->GetPluginNativeView());
+        old_host->view()->GetNativeView());
   }
 
   if (new_host && new_host->view()) {
     views::FocusManager::InstallFocusSubclass(
-        new_host->view()->GetPluginNativeView(), this);
+        new_host->view()->GetNativeView(), this);
   }
 
   // If we are focused, we need to pass the focus to the new RenderViewHost.