Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2489)

Unified Diff: chrome/browser/cocoa/browser_window_cocoa.mm

Issue 4694008: Make pink's TabContentsWrapper change compile on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/cocoa/browser_window_cocoa.mm
===================================================================
--- chrome/browser/cocoa/browser_window_cocoa.mm (revision 66453)
+++ chrome/browser/cocoa/browser_window_cocoa.mm (working copy)
@@ -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::UpdateDevTools() {
[controller_ updateDevToolsForContents:
- browser_->tabstrip_model()->GetSelectedTabContents()];
+ browser_->GetSelectedTabContents()];
}
void BrowserWindowCocoa::UpdateLoadingAnimations(bool should_animate) {
@@ -243,9 +244,9 @@
[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 @@
}
void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
- if (tab_contents == browser_->tabstrip_model()->GetSelectedTabContents()) {
+ if (tab_contents == browser_->GetSelectedTabContents()) {
[controller_ updateSidebarForContents:tab_contents];
}
}

Powered by Google App Engine
This is Rietveld 408576698