First cut at creating a refactored version of tab_contents_views. This is

chrome/browser/ui/views/tab_contents/tab_contents_container_views.h

Index: chrome/browser/ui/views/tab_contents/tab_contents_container_views.h
diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.h b/chrome/browser/ui/views/tab_contents/tab_contents_container_views.h
similarity index 83%
rename from chrome/browser/ui/views/tab_contents/tab_contents_container.h
rename to chrome/browser/ui/views/tab_contents/tab_contents_container_views.h
index 83633e8c1290c39aba0265ad142aebea4a4f9e4b..0969e0e3fa29e5c4f98cb68cb07a403c9d71d8ba 100644
--- a/chrome/browser/ui/views/tab_contents/tab_contents_container.h
+++ b/chrome/browser/ui/views/tab_contents/tab_contents_container_views.h
@@ -1,12 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_
-#define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_VIEWS_H_
 #pragma once
 
-#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "views/view.h"
@@ -38,7 +37,7 @@ class TabContentsContainer : public views::View,
   // Changes the TabContents associated with this view.
   void ChangeTabContents(TabContents* contents);
 
-  View* GetFocusView() { return native_container_->GetView(); }
+  View* GetFocusView() { return this; }
 
   // Accessor for |tab_contents_|.
   TabContents* tab_contents() const { return tab_contents_; }
@@ -59,15 +58,8 @@ class TabContentsContainer : public views::View,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
-  // Overridden from views::View:
-  virtual void Layout();
   virtual AccessibilityTypes::Role GetAccessibleRole();
 
- protected:
-  // Overridden from views::View:
-  virtual void ViewHierarchyChanged(bool is_add, views::View* parent,
-                                    views::View* child);
-
  private:
   // Add or remove observers for events that we care about.
   void AddObservers();
@@ -87,10 +79,6 @@ class TabContentsContainer : public views::View,
   void RenderWidgetHostViewChanged(RenderWidgetHostView* old_view,
                                    RenderWidgetHostView* new_view);
 
-  // An instance of a NativeTabContentsContainer object that holds the native
-  // view handle associated with the attached TabContents.
-  NativeTabContentsContainer* native_container_;
-
   // The attached TabContents.
   TabContents* tab_contents_;
 
@@ -103,4 +91,4 @@ class TabContentsContainer : public views::View,
   DISALLOW_COPY_AND_ASSIGN(TabContentsContainer);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_VIEWS_H_