Remove the last users of TabContentsContainer and remove the files.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10081028

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

2 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/external_tab/external_tab_container_win.cc b/chrome/browser/external_tab/external_tab_container_win.cc
index 13209f2..056c3d1 100644
--- a/chrome/browser/external_tab/external_tab_container_win.cc
+++ b/chrome/browser/external_tab/external_tab_container_win.cc
@@ -35,7 +35,6 @@
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
-#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -66,6 +65,7 @@
 #include "ui/base/models/menu_model.h"
 #include "ui/base/view_prop.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/controls/webview/webview.h"
 
 using content::BrowserThread;
 using content::LoadNotificationDetails;
@@ -1159,7 +1159,7 @@ void ExternalTabContainer::ServicePendingOpenURLRequests() {
 void ExternalTabContainer::SetupExternalTabView() {
   // Create a TabContentsContainer to handle focus cycling using Tab and
   // Shift-Tab.
-  tab_contents_container_ = new TabContentsContainer;
+  tab_contents_container_ = new views::WebView(tab_contents_->profile());
 
   // The views created here will be destroyed when the ExternalTabContainer
   // widget is torn down.
@@ -1186,7 +1186,7 @@ void ExternalTabContainer::SetupExternalTabView() {
   layout->AddView(tab_contents_container_);
   GetWidget()->SetContentsView(external_tab_view_);
   // Note that SetTabContents must be called after AddChildView is called
-  tab_contents_container_->ChangeWebContents(web_contents());
+  tab_contents_container_->SetWebContents(web_contents());
 }
 
 TemporaryPopupExternalTabContainer::TemporaryPopupExternalTabContainer(
diff --git a/chrome/browser/external_tab/external_tab_container_win.h b/chrome/browser/external_tab/external_tab_container_win.h
index ed743ab..0d635d5 100644
--- a/chrome/browser/external_tab/external_tab_container_win.h
+++ b/chrome/browser/external_tab/external_tab_container_win.h
@@ -43,6 +43,10 @@ namespace ui {
 class ViewProp;
 }
 
+namespace views {
+class WebView;
+}
+
 // This class serves as the container window for an external tab.
 // An external tab is a Chrome tab that is meant to displayed in an
 // external process. This class provides the FocusManger needed by the
@@ -286,7 +290,7 @@ class ExternalTabContainer : public content::WebContentsDelegate,
   content::NotificationRegistrar registrar_;
 
   // A view to handle focus cycling
-  TabContentsContainer* tab_contents_container_;
+  views::WebView* tab_contents_container_;
 
   int tab_handle_;
   // A failed navigation like a 404 is followed in chrome with a success