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 81%
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 1ba30ed6d712c1526f770e4b3cf796c1b0d1d3c0..d5a79aa4e7fbfe4b07dd9fe1feb80b1af077db79 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"
@@ -25,7 +24,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_; }
@@ -46,15 +45,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();
@@ -73,10 +65,6 @@ class TabContentsContainer : public views::View,
   // Called when the RenderWidgetHostView of the hosted TabContents has changed.
   void RenderWidgetHostViewChanged(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_;
 
@@ -91,4 +79,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_