diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 16:17:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-18 16:17:49 +0000 |
| commit | 3c9e187bd8ec34ebf2a91a37c868584c465647e8 (patch) | |
| tree | 84c9540d220fa155cf2af8c944638c0719dee670 /chrome/browser/cocoa/bookmarks | |
| parent | 3e35b224fd0c36f17f432f23e2eb3729667210b1 (diff) | |
| download | chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.zip chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.gz chromium_src-3c9e187bd8ec34ebf2a91a37c868584c465647e8.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/cocoa/bookmarks')
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm index 0c4be7c..125d8e1 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -11,6 +11,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "grit/generated_resources.h" @@ -44,7 +45,7 @@ TabStripModel* tabstrip_model = browser->tabstrip_model(); const int tabCount = tabstrip_model->count(); for (int i = 0; i < tabCount; ++i) { - TabContents* tc = tabstrip_model->GetTabContentsAt(i); + TabContents* tc = tabstrip_model->GetTabContentsAt(i)->tab_contents(); const string16 tabTitle = tc->GetTitle(); const GURL& tabURL(tc->GetURL()); ActiveTabNameURLPair tabPair(tabTitle, tabURL); diff --git a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm index 03e867e..79d8c23 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_bar_controller.mm @@ -1970,9 +1970,8 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) { #pragma mark BookmarkBarToolbarViewController Protocol - (int)currentTabContentsHeight { - return browser_->GetSelectedTabContents() ? - browser_->GetSelectedTabContents()->view()->GetContainerSize().height() : - 0; + TabContents* tc = browser_->GetSelectedTabContents(); + return tc ? tc->view()->GetContainerSize().height() : 0; } - (ThemeProvider*)themeProvider { |