Make pink's TabContentsWrapper change compile on Windows....

chrome/browser/instant/instant_controller.cc

 // 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.
 
 #include "chrome/browser/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.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/instant/instant_loader_manager.h"
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 
 // Number of ms to delay between loading urls.
 static const int kUpdateDelayMS = 200;
 
 static InstantController::Type GetType(Profile* profile) {
   return InstantController::IsEnabled(profile,
@@ skipping 116 matching lines @@
     return;
 
   base::TimeDelta delta =
       base::Time::Now() - base::Time::FromInternalValue(enable_time);
   std::string name = IsEnabled(profile, PREDICTIVE_TYPE) ?
       "Instant.TimeToDisable.Predictive" : "Instant.TimeToDisable.Verbatim";
   // histogram from 1 minute to 10 days.
   UMA_HISTOGRAM_CUSTOM_COUNTS(name, delta.InMinutes(), 1, 60 * 24 * 10, 50);
 }
 
-
-void InstantController::Update(TabContents* tab_contents,
+void InstantController::Update(TabContentsWrapper* tab_contents,
                                const AutocompleteMatch& match,
                                const string16& user_text,
                                string16* suggested_text) {
   if (tab_contents != tab_contents_)
     DestroyPreviewContents();
 
   const GURL& url = match.destination_url;
 
   tab_contents_ = tab_contents;
   commit_on_mouse_up_ = false;
@@ skipping 53 matching lines @@
 }
 
 bool InstantController::IsCurrent() {
   return loader_manager_.get() && loader_manager_->active_loader()->ready() &&
       !update_timer_.IsRunning();
 }
 
 void InstantController::CommitCurrentPreview(InstantCommitType type) {
   DCHECK(loader_manager_.get());
   DCHECK(loader_manager_->current_loader());
-  TabContents* tab = ReleasePreviewContents(type);
+  TabContentsWrapper* tab = ReleasePreviewContents(type);
   delegate_->CommitInstant(tab);
-  CompleteRelease(tab);
+  CompleteRelease(tab->tab_contents());
 }
 
 void InstantController::SetCommitOnMouseUp() {
   commit_on_mouse_up_ = true;
 }
 
 bool InstantController::IsMouseDownFromActivate() {
   DCHECK(loader_manager_.get());
   DCHECK(loader_manager_->current_loader());
   return loader_manager_->current_loader()->IsMouseDownFromActivate();
 }
 
 void InstantController::OnAutocompleteLostFocus(
     gfx::NativeView view_gaining_focus) {
   if (!is_active() || !GetPreviewContents())
     return;
 
   RenderWidgetHostView* rwhv =
-      GetPreviewContents()->GetRenderWidgetHostView();
+      GetPreviewContents()->tab_contents()->GetRenderWidgetHostView();
   if (!view_gaining_focus || !rwhv) {
     DestroyPreviewContents();
     return;
   }
 
-  gfx::NativeView tab_view = GetPreviewContents()->GetNativeView();
+  gfx::NativeView tab_view =
+      GetPreviewContents()->tab_contents()->GetNativeView();
   // Focus is going to the renderer.
   if (rwhv->GetNativeView() == view_gaining_focus ||
       tab_view == view_gaining_focus) {
     if (!IsMouseDownFromActivate()) {
       // If the mouse is not down, focus is not going to the renderer. Someone
       // else moved focus and we shouldn't commit.
       DestroyPreviewContents();
       return;
     }
 
@@ skipping 21 matching lines @@
   }
 
   if (view_gaining_focus_ancestor) {
     CommitCurrentPreview(INSTANT_COMMIT_FOCUS_LOST);
     return;
   }
 
   DestroyPreviewContents();
 }
 
-TabContents* InstantController::ReleasePreviewContents(InstantCommitType type) {
+TabContentsWrapper* InstantController::ReleasePreviewContents(
+    InstantCommitType type) {
   if (!loader_manager_.get())
     return NULL;
 
   scoped_ptr<InstantLoader> loader(loader_manager_->ReleaseCurrentLoader());
-  TabContents* tab = loader->ReleasePreviewContents(type);
+  TabContentsWrapper* tab = loader->ReleasePreviewContents(type);
 
   ClearBlacklist();
   is_active_ = false;
   omnibox_bounds_ = gfx::Rect();
   commit_on_mouse_up_ = false;
   loader_manager_.reset(NULL);
   update_timer_.Stop();
   return tab;
 }
 
 void InstantController::CompleteRelease(TabContents* tab) {
   tab->SetAllContentsBlocked(false);
 }
 
-TabContents* InstantController::GetPreviewContents() {
+TabContentsWrapper* InstantController::GetPreviewContents() {
   return loader_manager_.get() ?
       loader_manager_->current_loader()->preview_contents() : NULL;
 }
 
 bool InstantController::IsShowingInstant() {
   return loader_manager_.get() &&
       loader_manager_->current_loader()->is_showing_instant();
 }
 
 void InstantController::ShowInstantLoader(InstantLoader* loader) {
@@ skipping 176 matching lines @@
     template_url = model ? model->GetDefaultSearchProvider() : NULL;
   }
   if (template_url && template_url->id() &&
       template_url->instant_url() &&
       !IsBlacklistedFromInstant(template_url->id()) &&
       template_url->instant_url()->SupportsReplacement()) {
     return template_url;
   }
   return NULL;
 }