Refactors HWNDView, NativeViewHostGtk and NativeViewHost so that they match t...

chrome/browser/views/tab_contents/native_tab_contents_container_gtk.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h"
 
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
@@ skipping 12 matching lines @@
 NativeTabContentsContainerGtk::~NativeTabContentsContainerGtk() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainerGtk, NativeTabContentsContainer overrides:
 
 void NativeTabContentsContainerGtk::AttachContents(TabContents* contents) {
   // We need to register the tab contents window with the BrowserContainer so
   // that the BrowserContainer is the focused view when the focus is on the
   // TabContents window (for the TabContents case).
-  SetAssociatedFocusView(this);
+  set_focus_view(this);
 
   Attach(contents->GetNativeView());
 
   // TODO(port): figure out focus interception
 #if defined(OS_WIN)
   HWND contents_hwnd = contents->GetContentNativeView();
   if (contents_hwnd)
     views::FocusManager::InstallFocusSubclass(contents_hwnd, this);
 #endif
 }
 
 void NativeTabContentsContainerGtk::DetachContents(TabContents* contents) {
   // TODO(port): figure out focus interception
 #if defined(OS_WIN)
-  // TODO(brettw) should this move to HWNDView::Detach which is called below?
+  // TODO(brettw) should this move to NativeViewHost::Detach which is called below?
   // It needs cleanup regardless.
   HWND container_hwnd = contents->GetNativeView();
 
   // Hide the contents before adjusting its parent to avoid a full desktop
   // flicker.
   ShowWindow(container_hwnd, SW_HIDE);
 
   // Reset the parent to NULL to ensure hidden tabs don't receive messages.
   ::SetParent(container_hwnd, NULL);
 
@@ skipping 118 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabContentsContainer, public:
 
 // static
 NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
     TabContentsContainer* container) {
   return new NativeTabContentsContainerGtk(container);
 }