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

chrome/browser/cocoa/tabpose_window.mm

 // 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.
 
 #import "chrome/browser/cocoa/tabpose_window.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_callback_factory.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #import "chrome/browser/cocoa/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/renderer_host/backing_store_mac.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_mac.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/common/pref_names.h"
 #include "grit/app_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/utils/mac/SkCGUtils.h"
 
 const int kTopGradientHeight  = 15;
 
 NSString* const kAnimationIdKey = @"AnimationId";
 NSString* const kAnimationIdFadeIn = @"FadeIn";
 NSString* const kAnimationIdFadeOut = @"FadeOut";
@@ skipping 478 matching lines @@
   int count_y_;
 
   DISALLOW_COPY_AND_ASSIGN(TileSet);
 };
 
 void TileSet::Build(TabStripModel* source_model) {
   selected_index_ =  source_model->selected_index();
   tiles_.resize(source_model->count());
   for (size_t i = 0; i < tiles_.size(); ++i) {
     tiles_[i] = new Tile;
-    tiles_[i]->contents_ = source_model->GetTabContentsAt(i);
+    tiles_[i]->contents_ = source_model->GetTabContentsAt(i)->tab_contents();
   }
 }
 
 void TileSet::Layout(NSRect containing_rect) {
   int tile_count = tiles_.size();
   if (tile_count == 0)  // Happens e.g. during test shutdown.
     return;
 
   // Room around the tiles insde of |containing_rect|.
   const int kSmallPaddingTop = 30;
@@ skipping 738 matching lines @@
   const tabpose::Tile& tile = tileSet_->tile_at(i);
 
   CALayer* faviconLayer = [allFaviconLayers_ objectAtIndex:i];
   faviconLayer.frame = NSRectToCGRect(tile.favicon_rect());
   CALayer* titleLayer = [allTitleLayers_ objectAtIndex:i];
   titleLayer.frame = NSRectToCGRect(tile.title_rect());
   CALayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:i];
   thumbLayer.frame = NSRectToCGRect(tile.thumb_rect());
 }
 
-- (void)insertTabWithContents:(TabContents*)contents
+- (void)insertTabWithContents:(TabContentsWrapper*)contents
                       atIndex:(NSInteger)index
                  inForeground:(bool)inForeground {
   // This happens if you cmd-click a link and then immediately open tabpose
   // on a slowish machine.
   ScopedCAActionSetDuration durationSetter(kObserverChangeAnimationDuration);
 
   // Insert new layer and relayout.
-  tileSet_->InsertTileAt(index, contents);
+  tileSet_->InsertTileAt(index, contents->tab_contents());
   tileSet_->Layout(containingRect_);
   [self  addLayersForTile:tileSet_->tile_at(index)
                  showZoom:NO
                     slomo:NO
         animationDelegate:nil];
 
   // Update old layers.
   DCHECK_EQ(tabStripModel_->count(),
             static_cast<int>([allThumbnailLayers_ count]));
   DCHECK_EQ(tabStripModel_->count(),
             static_cast<int>([allTitleLayers_ count]));
   DCHECK_EQ(tabStripModel_->count(),
             static_cast<int>([allFaviconLayers_ count]));
 
   for (int i = 0; i < tabStripModel_->count(); ++i) {
     if (i == index)  // The new layer.
       continue;
     [self refreshLayerFramesAtIndex:i];
   }
 
   // Update selection.
   int selectedIndex = tileSet_->selected_index();
   if (selectedIndex >= index)
     selectedIndex++;
   [self selectTileAtIndex:selectedIndex];
 }
 
-- (void)tabClosingWithContents:(TabContents*)contents
+- (void)tabClosingWithContents:(TabContentsWrapper*)contents
                        atIndex:(NSInteger)index {
   // We will also get a -tabDetachedWithContents:atIndex: notification for
   // closing tabs, so do nothing here.
 }
 
-- (void)tabDetachedWithContents:(TabContents*)contents
+- (void)tabDetachedWithContents:(TabContentsWrapper*)contents
                         atIndex:(NSInteger)index {
   ScopedCAActionSetDuration durationSetter(kObserverChangeAnimationDuration);
 
   // Remove layer and relayout.
   tileSet_->RemoveTileAt(index);
   tileSet_->Layout(containingRect_);
 
   [[allThumbnailLayers_ objectAtIndex:index] removeFromSuperlayer];
   [allThumbnailLayers_ removeObjectAtIndex:index];
   [[allTitleLayers_ objectAtIndex:index] removeFromSuperlayer];
@@ skipping 16 matching lines @@
     [self refreshLayerFramesAtIndex:i];
 
   // Update selection.
   int selectedIndex = tileSet_->selected_index();
   if (selectedIndex >= index)
     selectedIndex--;
   if (selectedIndex >= 0)
     [self selectTileAtIndex:selectedIndex];
 }
 
-- (void)tabMovedWithContents:(TabContents*)contents
+- (void)tabMovedWithContents:(TabContentsWrapper*)contents
                     fromIndex:(NSInteger)from
                       toIndex:(NSInteger)to {
   ScopedCAActionSetDuration durationSetter(kObserverChangeAnimationDuration);
 
   // Move tile from |from| to |to|.
   tileSet_->MoveTileFromTo(from, to);
 
   // Move corresponding layers from |from| to |to|.
   scoped_nsobject<CALayer> thumbLayer(
       [[allThumbnailLayers_ objectAtIndex:from] retain]);
@@ skipping 16 matching lines @@
   int selectedIndex = tileSet_->selected_index();
   if (from == selectedIndex)
     selectedIndex = to;
   else if (from < selectedIndex && selectedIndex <= to)
     selectedIndex--;
   else if (to <= selectedIndex && selectedIndex < from)
     selectedIndex++;
   [self selectTileAtIndex:selectedIndex];
 }
 
-- (void)tabChangedWithContents:(TabContents*)contents
+- (void)tabChangedWithContents:(TabContentsWrapper*)contents
                        atIndex:(NSInteger)index
                     changeType:(TabStripModelObserver::TabChangeType)change {
   // Tell the window to update text, title, and thumb layers at |index| to get
   // their data from |contents|. |contents| can be different from the old
   // contents at that index!
   // While a tab is loading, this is unfortunately called quite often for
   // both the "loading" and the "all" change types, so we don't really want to
   // send thumb requests to the corresponding renderer when this is called.
   // For now, just make sure that we don't hold on to an invalid TabContents
   // object.
   tabpose::Tile& tile = tileSet_->tile_at(index);
-  if (contents == tile.tab_contents()) {
+  if (contents->tab_contents() == tile.tab_contents()) {
     // TODO(thakis): Install a timer to send a thumb request/update title/update
     // favicon after 20ms or so, and reset the timer every time this is called
     // to make sure we get an updated thumb, without requesting them all over.
     return;
   }
 
-  tile.set_tab_contents(contents);
+  tile.set_tab_contents(contents->tab_contents());
   ThumbnailLayer* thumbLayer = [allThumbnailLayers_ objectAtIndex:index];
-  [thumbLayer setTabContents:contents];
+  [thumbLayer setTabContents:contents->tab_contents()];
 }
 
 - (void)tabStripModelDeleted {
   [self close];
 }
 
 @end