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

chrome/browser/instant/instant_loader.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_loader.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
 #include "base/string_number_conversions.h"
 #include "base/timer.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/history/history_marshaling.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/renderer_preferences.h"
 #include "gfx/codec/png_codec.h"
 #include "ipc/ipc_message.h"
@@ skipping 106 matching lines @@
   }
 
   bool is_mouse_down_from_activate() const {
     return is_mouse_down_from_activate_;
   }
 
   void set_user_typed_before_load() { user_typed_before_load_ = true; }
 
   // Commits the currently buffered history.
   void CommitHistory() {
-    TabContents* tab = loader_->preview_contents();
+    TabContents* tab = loader_->preview_contents()->tab_contents();
     if (tab->profile()->IsOffTheRecord())
       return;
 
     for (size_t i = 0; i < add_page_vector_.size(); ++i)
       tab->UpdateHistoryForNavigation(add_page_vector_[i].get());
 
     NavigationEntry* active_entry = tab->controller().GetActiveEntry();
     DCHECK(active_entry);
     tab->UpdateHistoryPageTitle(*active_entry);
 
@@ skipping 142 matching lines @@
     return NULL;
   }
   virtual void TabContentsCreated(TabContents* new_contents) {}
   virtual bool infobars_enabled() { return false; }
   virtual bool ShouldEnablePreferredSizeNotifications() { return false; }
   virtual void UpdatePreferredSize(const gfx::Size& pref_size) {}
   virtual void ContentTypeChanged(TabContents* source) {}
 
   virtual void OnSetSuggestions(int32 page_id,
                                 const std::vector<std::string>& suggestions) {
-    TabContents* source = loader_->preview_contents();
+    TabContentsWrapper* source = loader_->preview_contents();
     if (!source->controller().GetActiveEntry() ||
         page_id != source->controller().GetActiveEntry()->page_id())
       return;
 
     // TODO: only allow for default search provider.
     // TODO(sky): Handle multiple suggestions.
     if (suggestions.empty())
       loader_->SetCompleteSuggestedText(string16());
     else
       loader_->SetCompleteSuggestedText(UTF8ToUTF16(suggestions[0]));
   }
 
   virtual void OnInstantSupportDetermined(int32 page_id, bool result) {
-    TabContents* source = loader_->preview_contents();
+    TabContents* source = loader_->preview_contents()->tab_contents();
     if (!source->controller().GetActiveEntry() ||
         page_id != source->controller().GetActiveEntry()->page_id())
       return;
 
     if (result) {
       gfx::Rect bounds = loader_->GetOmniboxBoundsInTermsOfPreview();
       loader_->last_omnibox_bounds_ = loader_->omnibox_bounds_;
       loader_->PageFinishedLoading();
     } else {
       loader_->PageDoesntSupportInstant(user_typed_before_load_);
@@ skipping 45 matching lines @@
 }
 
 InstantLoader::~InstantLoader() {
   registrar_.RemoveAll();
 
   // Delete the TabContents before the delegate as the TabContents holds a
   // reference to the delegate.
   preview_contents_.reset(NULL);
 }
 
-void InstantLoader::Update(TabContents* tab_contents,
+void InstantLoader::Update(TabContentsWrapper* tab_contents,
                            const TemplateURL* template_url,
                            const GURL& url,
                            PageTransition::Type transition_type,
                            const string16& user_text,
                            string16* suggested_text) {
   if (url_ == url)
     return;
 
   DCHECK(!url.is_empty() && url.is_valid());
 
   last_transition_type_ = transition_type;
   url_ = url;
   user_text_ = user_text;
 
   bool created_preview_contents;
   if (preview_contents_.get() == NULL) {
-    preview_contents_.reset(
-        new TabContents(tab_contents->profile(), NULL, MSG_ROUTING_NONE,
-                        NULL, NULL));
-    preview_contents_->SetAllContentsBlocked(true);
+    TabContents* new_contents =
+        new TabContents(
+            tab_contents->profile(), NULL, MSG_ROUTING_NONE, NULL, NULL);
+    preview_contents_.reset(new TabContentsWrapper(new_contents));
+    new_contents->SetAllContentsBlocked(true);
     // Propagate the max page id. That way if we end up merging the two
     // NavigationControllers (which happens if we commit) none of the page ids
     // will overlap.
-    int32 max_page_id = tab_contents->GetMaxPageID();
+    int32 max_page_id = tab_contents->tab_contents()->GetMaxPageID();
     if (max_page_id != -1)
       preview_contents_->controller().set_max_restored_page_id(max_page_id + 1);
 
-    preview_contents_->set_delegate(preview_tab_contents_delegate_.get());
+    new_contents->set_delegate(preview_tab_contents_delegate_.get());
 
     gfx::Rect tab_bounds;
     tab_contents->view()->GetContainerBounds(&tab_bounds);
     preview_contents_->view()->SizeContents(tab_bounds.size());
 
 #if defined(OS_MACOSX)
     // If |preview_contents_| does not currently have a RWHV, we will call
     // SetTakesFocusOnlyOnMouseDown() as a result of the
     // RENDER_VIEW_HOST_CHANGED notification.
-    if (preview_contents_->GetRenderWidgetHostView()) {
-      preview_contents_->GetRenderWidgetHostView()->
+    if (preview_contents_->tab_contents()->GetRenderWidgetHostView()) {
+      preview_contents_->tab_contents()->GetRenderWidgetHostView()->
           SetTakesFocusOnlyOnMouseDown(true);
     }
     registrar_.Add(
         this,
         NotificationType::RENDER_VIEW_HOST_CHANGED,
         Source<NavigationController>(&preview_contents_->controller()));
 #endif
 
-    preview_contents_->ShowContents();
+    preview_contents_->tab_contents()->ShowContents();
     created_preview_contents = true;
   } else {
     created_preview_contents = false;
   }
   preview_tab_contents_delegate_->PrepareForNewLoad();
 
   if (template_url) {
     DCHECK(template_url_id_ == template_url->id());
     if (!created_preview_contents) {
       if (is_waiting_for_load()) {
@@ skipping 25 matching lines @@
       GURL instant_url(
           template_url->instant_url()->ReplaceSearchTerms(
               *template_url, std::wstring(), -1, std::wstring()));
       CommandLine* cl = CommandLine::ForCurrentProcess();
       if (cl->HasSwitch(switches::kInstantURL))
         instant_url = GURL(cl->GetSwitchValueASCII(switches::kInstantURL));
       initial_instant_url_ = url;
       preview_contents_->controller().LoadURL(
           instant_url, GURL(), transition_type);
       frame_load_observer_.reset(
-          new FrameLoadObserver(preview_contents(), user_text_));
+          new FrameLoadObserver(preview_contents()->tab_contents(),
+                                user_text_));
     }
   } else {
     DCHECK(template_url_id_ == 0);
     frame_load_observer_.reset(NULL);
     preview_contents_->controller().LoadURL(url_, GURL(), transition_type);
   }
 }
 
 void InstantLoader::SetOmniboxBounds(const gfx::Rect& bounds) {
   if (omnibox_bounds_ == bounds)
@@ skipping 10 matching lines @@
     update_bounds_timer_.Start(
         base::TimeDelta::FromMilliseconds(kUpdateBoundsDelayMS),
         this, &InstantLoader::ProcessBoundsChange);
   }
 }
 
 bool InstantLoader::IsMouseDownFromActivate() {
   return preview_tab_contents_delegate_->is_mouse_down_from_activate();
 }
 
-TabContents* InstantLoader::ReleasePreviewContents(InstantCommitType type) {
+TabContentsWrapper* InstantLoader::ReleasePreviewContents(
+    InstantCommitType type) {
   if (!preview_contents_.get())
     return NULL;
 
   // FrameLoadObserver is only used for instant results, and instant results are
   // only committed if active (when the FrameLoadObserver isn't installed).
   DCHECK(type == INSTANT_COMMIT_DESTROY || !frame_load_observer_.get());
 
   if (type != INSTANT_COMMIT_DESTROY && is_showing_instant()) {
     if (type == INSTANT_COMMIT_FOCUS_LOST)
       preview_contents_->render_view_host()->SearchBoxCancel();
     else
       preview_contents_->render_view_host()->SearchBoxSubmit(
           user_text_, type == INSTANT_COMMIT_PRESSED_ENTER);
   }
   omnibox_bounds_ = gfx::Rect();
   last_omnibox_bounds_ = gfx::Rect();
   url_ = GURL();
   user_text_.clear();
   complete_suggested_text_.clear();
   if (preview_contents_.get()) {
     if (type != INSTANT_COMMIT_DESTROY)
       preview_tab_contents_delegate_->CommitHistory();
     // Destroy the paint observer.
     // RenderWidgetHostView may be null during shutdown.
-    if (preview_contents_->GetRenderWidgetHostView()) {
-      preview_contents_->GetRenderWidgetHostView()->GetRenderWidgetHost()->
-          set_paint_observer(NULL);
+    if (preview_contents_->tab_contents()->GetRenderWidgetHostView()) {
+      preview_contents_->tab_contents()->GetRenderWidgetHostView()->
+          GetRenderWidgetHost()->set_paint_observer(NULL);
 #if defined(OS_MACOSX)
-      preview_contents_->GetRenderWidgetHostView()->
+      preview_contents_->tab_contents()->GetRenderWidgetHostView()->
           SetTakesFocusOnlyOnMouseDown(false);
       registrar_.Remove(
           this,
           NotificationType::RENDER_VIEW_HOST_CHANGED,
           Source<NavigationController>(&preview_contents_->controller()));
 #endif
     }
     preview_contents_->set_delegate(NULL);
     preview_tab_contents_delegate_->Reset();
     ready_ = false;
@@ skipping 124 matching lines @@
   if (last_omnibox_bounds_ == omnibox_bounds_)
     return;
 
   last_omnibox_bounds_ = omnibox_bounds_;
   if (preview_contents_.get() && is_showing_instant() &&
       !is_waiting_for_load()) {
     preview_contents_->render_view_host()->SearchBoxResize(
         GetOmniboxBoundsInTermsOfPreview());
   }
 }