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

chrome/browser/chromeos/wm_overview_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/chromeos/wm_overview_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/linked_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/chromeos/wm_overview_fav_icon.h"
 #include "chrome/browser/chromeos/wm_overview_snapshot.h"
 #include "chrome/browser/chromeos/wm_overview_title.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/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/common/notification_service.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 #include "views/window/window.h"
 
 using std::vector;
 
@@ skipping 32 matching lines @@
 
 // The number of additional padding pixels to remove from the title width.
 static const int kFavIconPadding = 5;
 
 class BrowserListener : public TabStripModelObserver {
  public:
   BrowserListener(Browser* browser, WmOverviewController* parent);
   ~BrowserListener();
 
   // Begin TabStripModelObserver methods
-  virtual void TabInsertedAt(TabContents* contents,
+  virtual void TabInsertedAt(TabContentsWrapper* contents,
                              int index,
                              bool foreground);
   virtual void TabClosingAt(TabStripModel* tab_strip_model,
-                            TabContents* contents,
+                            TabContentsWrapper* contents,
                             int index) {}
-  virtual void TabDetachedAt(TabContents* contents, int index);
-  virtual void TabMoved(TabContents* contents,
+  virtual void TabDetachedAt(TabContentsWrapper* contents, int index);
+  virtual void TabMoved(TabContentsWrapper* contents,
                         int from_index,
                         int to_index);
-  virtual void TabChangedAt(TabContents* contents, int index,
+  virtual void TabChangedAt(TabContentsWrapper* contents, int index,
                             TabStripModelObserver::TabChangeType change_type);
   virtual void TabStripEmpty();
-  virtual void TabDeselectedAt(TabContents* contents, int index) {}
-  virtual void TabSelectedAt(TabContents* old_contents,
-                             TabContents* new_contents,
+  virtual void TabDeselectedAt(TabContentsWrapper* contents, int index) {}
+  virtual void TabSelectedAt(TabContentsWrapper* old_contents,
+                             TabContentsWrapper* new_contents,
                              int index,
                              bool user_gesture);
   // End TabStripModelObserver methods
 
   // Returns the number of tabs in this child.
   int count() const { return browser_->tabstrip_model()->count(); }
 
   // Returns the browser that this child gets its data from.
   Browser* browser() const { return browser_; }
 
@@ skipping 20 matching lines @@
   void RestoreOriginalSelectedTab();
 
   // Selects the tab at the given index.
   void SelectTab(int index, uint32 timestamp);
 
   // Shows any snapshots that are not visible.
   void ShowSnapshots();
 
   // Returns the tab contents from the tab model for this child at index.
   TabContents* GetTabContentsAt(int index) const  {
-    return browser_->tabstrip_model()->GetTabContentsAt(index);
+    return browser_->tabstrip_model()->GetTabContentsAt(index)->tab_contents();
   }
  private:
   // Calculate the size of a cell based on the browser window's size.
   gfx::Size CalculateCellSize();
 
   // Configures a cell from the tab contents.
   void ConfigureCell(WmOverviewSnapshot* cell, TabContents* contents);
 
   // Configures a cell from the model.
   void ConfigureCell(WmOverviewSnapshot* cell, int index) {
@@ skipping 55 matching lines @@
   // This browser didn't already exist, and so we haven't been
   // watching it for tab insertions, so we need to create the
   // snapshots associated with it.
   RecreateSnapshots();
 }
 
 BrowserListener::~BrowserListener() {
   browser_->tabstrip_model()->RemoveObserver(this);
 }
 
-void BrowserListener::TabInsertedAt(TabContents* contents,
+void BrowserListener::TabInsertedAt(TabContentsWrapper* contents,
                                     int index,
                                     bool foreground) {
   InsertSnapshot(index);
   RenumberSnapshots(index);
   UpdateSelectedIndex(browser_->selected_index());
 }
 
-void BrowserListener::TabDetachedAt(TabContents* contents, int index) {
+void BrowserListener::TabDetachedAt(TabContentsWrapper* contents, int index) {
   ClearSnapshot(index);
   UpdateSelectedIndex(browser_->selected_index());
   RenumberSnapshots(index);
 }
 
-void BrowserListener::TabMoved(TabContents* contents,
+void BrowserListener::TabMoved(TabContentsWrapper* contents,
                                int from_index,
                                int to_index) {
   // Need to reorder tab in the snapshots list, and reset the window
   // type atom on the affected snapshots (the one moved, and all the
   // ones after it), so that their indices are correct.
   SnapshotNode node = snapshots_[from_index];
   snapshots_.erase(snapshots_.begin() + from_index);
   snapshots_.insert(snapshots_.begin() + to_index, node);
 
   RenumberSnapshots(std::min(to_index, from_index));
   UpdateSelectedIndex(browser_->selected_index());
 }
 
 void BrowserListener::TabChangedAt(
-    TabContents* contents,
+    TabContentsWrapper* contents,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
   if (change_type != TabStripModelObserver::LOADING_ONLY) {
-    snapshots_[index].title->SetTitle(contents->GetTitle());
-    snapshots_[index].title->SetUrl(contents->GetURL());
-    snapshots_[index].fav_icon->SetFavIcon(contents->GetFavIcon());
+    snapshots_[index].title->SetTitle(contents->tab_contents()->GetTitle());
+    snapshots_[index].title->SetUrl(contents->tab_contents()->GetURL());
+    snapshots_[index].fav_icon->SetFavIcon(
+        contents->tab_contents()->GetFavIcon());
     if (change_type != TabStripModelObserver::TITLE_NOT_LOADING)
       ReloadSnapshot(index);
   }
 }
 
 void BrowserListener::TabStripEmpty() {
   snapshots_.clear();
 }
 
-void BrowserListener::TabSelectedAt(TabContents* old_contents,
-                                    TabContents* new_contents,
+void BrowserListener::TabSelectedAt(TabContentsWrapper* old_contents,
+                                    TabContentsWrapper* new_contents,
                                     int index,
                                     bool user_gesture) {
   UpdateSelectedIndex(index);
 }
 
 void BrowserListener::ReloadSnapshot(int index) {
   snapshots_[index].snapshot->reload_snapshot();
   controller_->StartDelayTimer();
 }
 
@@ skipping 409 matching lines @@
     if (item.get() == NULL) {
       item = BrowserListenerVector::value_type(
           new BrowserListener(*iterator, this));
     }
     listeners_.push_back(item);
     ++iterator;
   }
 }
 
 }  // namespace chromeos