From 3c9e187bd8ec34ebf2a91a37c868584c465647e8 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 18 Nov 2010 16:17:49 +0000 Subject: Make pink's TabContentsWrapper change compile on Windows. Code by pinkerton@, with modifications by evanm and myself to get it to build on windows/linux/chromeos. BUG=none TEST=none Review URL: http://codereview.chromium.org/4694008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66626 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/cocoa/browser_window_cocoa.mm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome/browser/cocoa/browser_window_cocoa.mm') diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index 5ce7156..8cac684 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -40,6 +40,7 @@ #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" @@ -180,7 +181,7 @@ void BrowserWindowCocoa::ShelfVisibilityChanged() { void BrowserWindowCocoa::UpdateDevTools() { [controller_ updateDevToolsForContents: - browser_->tabstrip_model()->GetSelectedTabContents()]; + browser_->GetSelectedTabContents()]; } void BrowserWindowCocoa::UpdateLoadingAnimations(bool should_animate) { @@ -243,9 +244,9 @@ 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]; } @@ -625,7 +626,7 @@ NSWindow* BrowserWindowCocoa::window() const { } void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) { - if (tab_contents == browser_->tabstrip_model()->GetSelectedTabContents()) { + if (tab_contents == browser_->GetSelectedTabContents()) { [controller_ updateSidebarForContents:tab_contents]; } } -- cgit v1.1