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

chrome/browser/cocoa/browser_window_controller.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/browser_window_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "app/l10n_util.h"
 #include "app/l10n_util_mac.h"
@@ skipping 36 matching lines @@
 #include "chrome/browser/dock_info.h"
 #include "chrome/browser/encoding_menu_controller.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_widget_host_view.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util_mac.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
+#include "chrome/browser/tab_contents_wrapper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 
 // ORGANIZATION: This is a big file. It is (in principle) organized as follows
 // (in order):
 // 1. Interfaces. Very short, one-time-use classes may include an implementation
@@ skipping 542 matching lines @@
   }
 
   // To prevent strange results on portrait displays, the basic minimum zoomed
   // width is the larger of: 60% of available width, 60% of available height
   // (bounded by available width).
   const CGFloat kProportion = 0.6;
   CGFloat zoomedWidth =
       std::max(kProportion * frame.size.width,
                std::min(kProportion * frame.size.height, frame.size.width));
 
-  TabContents* contents = browser_->tabstrip_model()->GetSelectedTabContents();
+  TabContents* contents = browser_->GetSelectedTabContents();
   if (contents) {
     // If the intrinsic width is bigger, then make it the zoomed width.
     const int kScrollbarWidth = 16;  // TODO(viettrungluu): ugh.
     TabContentsViewMac* tab_contents_view =
         static_cast<TabContentsViewMac*>(contents->view());
     CGFloat intrinsicWidth = static_cast<CGFloat>(
         tab_contents_view->preferred_width() + kScrollbarWidth);
     zoomedWidth = std::max(zoomedWidth,
                            std::min(intrinsicWidth, frame.size.width));
   }
@@ skipping 449 matching lines @@
      fromController:(TabWindowController*)dragController {
   if (dragController) {
     // Moving between windows. Figure out the TabContents to drop into our tab
     // model from the source window's model.
     BOOL isBrowser =
         [dragController isKindOfClass:[BrowserWindowController class]];
     DCHECK(isBrowser);
     if (!isBrowser) return;
     BrowserWindowController* dragBWC = (BrowserWindowController*)dragController;
     int index = [dragBWC->tabStripController_ modelIndexForTabView:view];
-    TabContents* contents =
-        dragBWC->browser_->tabstrip_model()->GetTabContentsAt(index);
+    TabContentsWrapper* contents =
+        dragBWC->browser_->GetTabContentsWrapperAt(index);
     // The tab contents may have gone away if given a window.close() while it
     // is being dragged. If so, bail, we've got nothing to drop.
     if (!contents)
       return;
 
     // Convert |view|'s frame (which starts in the source tab strip's coordinate
     // system) to the coordinate system of the destination tab strip. This needs
     // to be done before being detached so the window transforms can be
     // performed.
     NSRect destinationFrame = [view frame];
@@ skipping 57 matching lines @@
 - (void)layoutTabs {
   [tabStripController_ layoutTabs];
 }
 
 - (TabWindowController*)detachTabToNewWindow:(TabView*)tabView {
   // Disable screen updates so that this appears as a single visual change.
   app::mac::ScopedNSDisableScreenUpdates disabler;
 
   // Fetch the tab contents for the tab being dragged.
   int index = [tabStripController_ modelIndexForTabView:tabView];
-  TabContents* contents = browser_->tabstrip_model()->GetTabContentsAt(index);
+  TabContentsWrapper* contents = browser_->GetTabContentsWrapperAt(index);
 
   // Set the window size. Need to do this before we detach the tab so it's
   // still in the window. We have to flip the coordinates as that's what
   // is expected by the Browser code.
   NSWindow* sourceWindow = [tabView window];
   NSRect windowRect = [sourceWindow frame];
   NSScreen* screen = [sourceWindow screen];
   windowRect.origin.y =
       [screen frame].size.height - windowRect.size.height -
           windowRect.origin.y;
@@ skipping 137 matching lines @@
 - (NSInteger)numberOfTabs {
   // count() includes pinned tabs.
   return browser_->tabstrip_model()->count();
 }
 
 - (BOOL)hasLiveTabs {
   return !browser_->tabstrip_model()->empty();
 }
 
 - (NSString*)selectedTabTitle {
-  TabContents* contents = browser_->tabstrip_model()->GetSelectedTabContents();
+  TabContents* contents = browser_->GetSelectedTabContents();
   return base::SysUTF16ToNSString(contents->GetTitle());
 }
 
 - (NSRect)regularWindowFrame {
   return [self isFullscreen] ? [savedRegularWindow_ frame] :
                                [[self window] frame];
 }
 
 // (Override of |TabWindowController| method.)
 - (BOOL)hasTabStrip {
@@ skipping 705 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isNormalWindow {
   return browser_->type() == Browser::TYPE_NORMAL;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)