TabContentsWrapper -> TabContents, part 18.

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/instant/instant_delegate.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
@@ skipping 63 matching lines @@
                                bool verbatim,
                                string16* suggested_text) {
   suggested_text->clear();
 
   is_out_of_date_ = false;
   commit_on_mouse_up_ = false;
   last_transition_type_ = match.transition;
   last_url_ = match.destination_url;
   last_user_text_ = user_text;
 
-  TabContentsWrapper* tab_contents = delegate_->GetInstantHostTabContents();
+  TabContents* tab_contents = delegate_->GetInstantHostTabContents();
   if (!tab_contents) {
     Hide();
     return false;
   }
 
   Profile* profile = tab_contents->profile();
   const TemplateURL* template_url = match.GetTemplateURL(profile);
   const TemplateURL* default_t_url =
       TemplateURLServiceFactory::GetForProfile(profile)
                                  ->GetDefaultSearchProvider();
@@ skipping 64 matching lines @@
 }
 
 bool InstantController::PrepareForCommit() {
   if (is_out_of_date_ || !loader_.get())
     return false;
 
   // If we are in the visible (INSTANT) mode, return the status of the preview.
   if (mode_ == INSTANT)
     return IsCurrent();
 
-  TabContentsWrapper* tab_contents = delegate_->GetInstantHostTabContents();
+  TabContents* tab_contents = delegate_->GetInstantHostTabContents();
   if (!tab_contents)
     return false;
 
   const TemplateURL* template_url =
       TemplateURLServiceFactory::GetForProfile(tab_contents->profile())
                                  ->GetDefaultSearchProvider();
   if (!IsValidInstantTemplateURL(template_url) ||
       loader_->template_url_id() != template_url->id() ||
       loader_->IsNavigationPending() ||
       loader_->is_determining_if_page_supports_instant()) {
     return false;
   }
 
   // In the SUGGEST and HIDDEN modes, we must have sent an Update() by now, so
   // check if the loader failed to process it.
   if ((mode_ == SUGGEST || mode_ == HIDDEN)
       && (!loader_->ready() || !loader_->http_status_ok())) {
     return false;
   }
 
   // Ignore the suggested text, as we are about to commit the verbatim query.
   string16 suggested_text;
   UpdateLoader(tab_contents, template_url, last_url_, last_transition_type_,
                last_user_text_, true, &suggested_text);
   return true;
 }
 
-TabContentsWrapper* InstantController::CommitCurrentPreview(
-    InstantCommitType type) {
+TabContents* InstantController::CommitCurrentPreview(InstantCommitType type) {
   DCHECK(loader_.get());
-  TabContentsWrapper* tab_contents = delegate_->GetInstantHostTabContents();
+  TabContents* tab_contents = delegate_->GetInstantHostTabContents();
   DCHECK(tab_contents);
-  TabContentsWrapper* preview = ReleasePreviewContents(type, tab_contents);
+  TabContents* preview = ReleasePreviewContents(type, tab_contents);
   preview->web_contents()->GetController().CopyStateFromAndPrune(
       &tab_contents->web_contents()->GetController());
   delegate_->CommitInstant(preview);
   CompleteRelease(preview);
   return preview;
 }
 
 bool InstantController::CommitIfCurrent() {
   if (IsCurrent()) {
     CommitCurrentPreview(INSTANT_COMMIT_PRESSED_ENTER);
@@ skipping 87 matching lines @@
   if (view_gaining_focus_ancestor) {
     CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
     return;
   }
 
   DestroyPreviewContents();
 }
 #endif
 
 void InstantController::OnAutocompleteGotFocus() {
-  TabContentsWrapper* tab_contents = delegate_->GetInstantHostTabContents();
+  TabContents* tab_contents = delegate_->GetInstantHostTabContents();
   if (!tab_contents)
     return;
 
   const TemplateURL* template_url =
       TemplateURLServiceFactory::GetForProfile(tab_contents->profile())
                                  ->GetDefaultSearchProvider();
   if (!IsValidInstantTemplateURL(template_url))
     return;
 
   if (!loader_.get() || loader_->template_url_id() != template_url->id())
     loader_.reset(new InstantLoader(this, template_url->id(), std::string()));
   loader_->MaybeLoadInstantURL(tab_contents, template_url);
 }
 
-TabContentsWrapper* InstantController::ReleasePreviewContents(
+TabContents* InstantController::ReleasePreviewContents(
     InstantCommitType type,
-    TabContentsWrapper* current_tab) {
+    TabContents* current_tab) {
   if (!loader_.get())
     return NULL;
 
-  TabContentsWrapper* tab = loader_->ReleasePreviewContents(type, current_tab);
+  TabContents* tab = loader_->ReleasePreviewContents(type, current_tab);
   ClearBlacklist();
   is_out_of_date_ = true;
   is_displayable_ = false;
   commit_on_mouse_up_ = false;
   omnibox_bounds_ = gfx::Rect();
   loader_.reset();
   return tab;
 }
 
-void InstantController::CompleteRelease(TabContentsWrapper* tab) {
+void InstantController::CompleteRelease(TabContents* tab) {
   tab->blocked_content_tab_helper()->SetAllContentsBlocked(false);
 }
 
-TabContentsWrapper* InstantController::GetPreviewContents() const {
+TabContents* InstantController::GetPreviewContents() const {
   return loader_.get() ? loader_->preview_contents() : NULL;
 }
 
 void InstantController::InstantStatusChanged(InstantLoader* loader) {
   DCHECK(loader_.get());
   UpdateIsDisplayable();
 }
 
 void InstantController::SetSuggestedTextFor(
     InstantLoader* loader,
@@ skipping 63 matching lines @@
     delegate_->HideInstant();
   } else {
     delegate_->ShowInstant(loader_->preview_contents());
     content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_INSTANT_CONTROLLER_SHOWN,
         content::Source<InstantController>(this),
         content::NotificationService::NoDetails());
   }
 }
 
-void InstantController::UpdateLoader(TabContentsWrapper* tab_contents,
+void InstantController::UpdateLoader(TabContents* tab_contents,
                                      const TemplateURL* template_url,
                                      const GURL& url,
                                      content::PageTransition transition_type,
                                      const string16& user_text,
                                      bool verbatim,
                                      string16* suggested_text) {
   if (mode_ == INSTANT)
     loader_->SetOmniboxBounds(omnibox_bounds_);
   loader_->Update(tab_contents, template_url, url, transition_type, user_text,
                   verbatim, suggested_text);
@@ skipping 36 matching lines @@
   if (!weak_factory_.HasWeakPtrs()) {
     MessageLoop::current()->PostTask(
         FROM_HERE, base::Bind(&InstantController::DestroyLoaders,
                               weak_factory_.GetWeakPtr()));
   }
 }
 
 void InstantController::DestroyLoaders() {
   loaders_to_destroy_.reset();
 }