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

chrome/browser/cocoa/browser_window_cocoa.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.
 
 #include "chrome/browser/cocoa/browser_window_cocoa.h"
 
 #include "app/l10n_util_mac.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 22 matching lines @@
 #import "chrome/browser/cocoa/theme_install_bubble_view.h"
 #import "chrome/browser/cocoa/toolbar_controller.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/page_info_window.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sidebar/sidebar_container.h"
 #include "chrome/browser/sidebar/sidebar_manager.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/native_web_keyboard_event.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "gfx/rect.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser,
                                        BrowserWindowController* controller,
@@ skipping 120 matching lines @@
 
 void BrowserWindowCocoa::ShelfVisibilityChanged() {
   // Mac doesn't yet support showing the bookmark bar at a different size on
   // the new tab page. When it does, this method should attempt to relayout the
   // bookmark bar/extension shelf as their preferred height may have changed.
   // http://crbug.com/43346
 }
 
 void BrowserWindowCocoa::UpdateDevTools() {
   [controller_ updateDevToolsForContents:
-      browser_->tabstrip_model()->GetSelectedTabContents()];
+      browser_->GetSelectedTabContents()];
 }
 
 void BrowserWindowCocoa::UpdateLoadingAnimations(bool should_animate) {
   // Do nothing on Mac.
 }
 
 void BrowserWindowCocoa::SetStarredState(bool is_starred) {
   [controller_ setStarredState:is_starred ? YES : NO];
 }
 
@@ skipping 42 matching lines @@
 }
 
 void BrowserWindowCocoa::SetFocusToLocationBar(bool select_all) {
   [controller_ focusLocationBar:select_all ? YES : NO];
 }
 
 void BrowserWindowCocoa::UpdateReloadStopState(bool is_loading, bool force) {
   [controller_ setIsLoading:is_loading force:force];
 }
 
-void BrowserWindowCocoa::UpdateToolbar(TabContents* contents,
+void BrowserWindowCocoa::UpdateToolbar(TabContentsWrapper* contents,
                                        bool should_restore_state) {
-  [controller_ updateToolbarWithContents:contents
+  [controller_ updateToolbarWithContents:contents->tab_contents()
                       shouldRestoreState:should_restore_state ? YES : NO];
 }
 
 void BrowserWindowCocoa::FocusToolbar() {
   // Not needed on the Mac.
 }
 
 void BrowserWindowCocoa::FocusAppMenu() {
   // Chrome uses the standard Mac OS X menu bar, so this isn't needed.
 }
@@ skipping 359 matching lines @@
 
   // at this point the controller is dead (autoreleased), so
   // make sure we don't try to reference it any more.
 }
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }
 
 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
-  if (tab_contents == browser_->tabstrip_model()->GetSelectedTabContents()) {
+  if (tab_contents == browser_->GetSelectedTabContents()) {
     [controller_ updateSidebarForContents:tab_contents];
   }
 }