TabContentsWrapper -> TabContents, part 6.

chrome/browser/external_tab/external_tab_container_win.cc

 // Copyright (c) 2012 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/external_tab/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 15 matching lines @@
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/repost_form_warning_controller.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_win.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/load_notification_details.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
@@ skipping 96 matching lines @@
 WebContents * ExternalTabContainer::web_contents() const {
   return tab_contents_.get() ? tab_contents_->web_contents() : NULL;
 }
 
 bool ExternalTabContainer::Init(Profile* profile,
                                 HWND parent,
                                 const gfx::Rect& bounds,
                                 DWORD style,
                                 bool load_requests_via_automation,
                                 bool handle_top_level_requests,
-                                TabContentsWrapper* existing_contents,
+                                TabContents* existing_contents,
                                 const GURL& initial_url,
                                 const GURL& referrer,
                                 bool infobars_enabled,
                                 bool route_all_top_level_navigations) {
   if (IsWindow()) {
     NOTREACHED();
     return false;
   }
 
   load_requests_via_automation_ = load_requests_via_automation;
@@ skipping 14 matching lines @@
   // TODO(jcampan): limit focus traversal to contents.
 
   prop_.reset(new ViewProp(GetNativeView(), kWindowObjectKey, this));
 
   if (existing_contents) {
     tab_contents_.reset(existing_contents);
     tab_contents_->web_contents()->GetController().SetBrowserContext(profile);
   } else {
     WebContents* new_contents = WebContents::Create(
         profile, NULL, MSG_ROUTING_NONE, NULL, NULL);
-    tab_contents_.reset(new TabContentsWrapper(new_contents));
+    tab_contents_.reset(new TabContents(new_contents));
   }
 
   if (!infobars_enabled)
     tab_contents_->infobar_tab_helper()->set_infobars_enabled(false);
 
   tab_contents_->web_contents()->SetDelegate(this);
 
   tab_contents_->web_contents()->
       GetMutableRendererPrefs()->browser_handles_non_local_top_level_requests =
           handle_top_level_requests;
@@ skipping 244 matching lines @@
     // Reuse the same tab handle here as the new container instance is a dummy
     // instance which does not have an automation client connected at the other
     // end.
     new_container = new TemporaryPopupExternalTabContainer(
         automation_, automation_resource_message_filter_.get());
     new_container->SetTabHandle(tab_handle_);
   }
 
   // Make sure that ExternalTabContainer instance is initialized with
   // an unwrapped Profile.
-  scoped_ptr<TabContentsWrapper> wrapper(new TabContentsWrapper(new_contents));
+  scoped_ptr<TabContents> tab_contents(new TabContents(new_contents));
   bool result = new_container->Init(
-      wrapper->profile()->GetOriginalProfile(),
+      tab_contents->profile()->GetOriginalProfile(),
       NULL,
       initial_pos,
       WS_CHILD,
       load_requests_via_automation_,
       handle_top_level_requests_,
-      wrapper.get(),
+      tab_contents.get(),
       GURL(),
       GURL(),
       true,
       route_all_top_level_navigations_);
 
   if (result) {
-    Profile* profile = wrapper->profile();
-    wrapper.release();  // Ownership has been transferred.
+    Profile* profile = tab_contents->profile();
+    tab_contents.release();  // Ownership has been transferred.
     if (route_all_top_level_navigations_) {
       return;
     }
     uintptr_t cookie = reinterpret_cast<uintptr_t>(new_container.get());
     pending_tabs_.Get()[cookie] = new_container;
     new_container->set_pending(true);
     new_container->set_is_popup_window(disposition == NEW_POPUP);
     AttachExternalTabParams attach_params_;
     attach_params_.cookie = static_cast<uint64>(cookie);
     attach_params_.dimensions = initial_pos;
@@ skipping 34 matching lines @@
     automation_->Send(new AutomationMsg_CloseExternalTab(tab_handle_));
   }
 }
 
 void ExternalTabContainer::MoveContents(WebContents* source,
                                         const gfx::Rect& pos) {
   if (automation_ && is_popup_window_)
     automation_->Send(new AutomationMsg_MoveWindow(tab_handle_, pos));
 }
 
-TabContentsWrapper* ExternalTabContainer::GetConstrainingContentsWrapper(
-    TabContentsWrapper* source) {
+TabContents* ExternalTabContainer::GetConstrainingContentsWrapper(
+    TabContents* source) {
   return source;
 }
 
 bool ExternalTabContainer::IsPopupOrPanel(const WebContents* source) const {
   return is_popup_window_;
 }
 
 void ExternalTabContainer::UpdateTargetURL(WebContents* source,
                                            int32 page_id,
                                            const GURL& url) {
@@ skipping 174 matching lines @@
     automation_->Send(unload_reply_message_);
     unload_reply_message_ = NULL;
     *proceed_to_fire_unload = false;
   }
 }
 
 void ExternalTabContainer::ShowRepostFormWarningDialog(
     WebContents* source) {
   browser::ShowTabModalConfirmDialog(
       new RepostFormWarningController(source),
-      TabContentsWrapper::GetCurrentWrapperForContents(source));
+      TabContents::GetOwningTabContentsForWebContents(source));
 }
 
 void ExternalTabContainer::RunFileChooser(
     WebContents* tab, const content::FileChooserParams& params) {
   FileSelectHelper::RunFileChooser(tab, params);
 }
 
 void ExternalTabContainer::EnumerateDirectory(WebContents* tab, int request_id,
                                               const FilePath& path) {
   FileSelectHelper::EnumerateDirectory(tab, request_id, path);
@@ skipping 471 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   WebContents* new_contents =
       ExternalTabContainer::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }