diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 23:12:36 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 23:12:36 +0000 |
| commit | e1fbf5bb7ff932edf51c328aaf9c3c8a8a2b7eb7 (patch) | |
| tree | 7853a5989372ae9acc42b3b6453886acbf28d9a5 /chrome/browser/views/frame/glass_browser_frame_view.cc | |
| parent | 57c959f989ccc8f6a9e47190294ee2b9e22c2fb2 (diff) | |
| download | chromium_src-e1fbf5bb7ff932edf51c328aaf9c3c8a8a2b7eb7.zip chromium_src-e1fbf5bb7ff932edf51c328aaf9c3c8a8a2b7eb7.tar.gz chromium_src-e1fbf5bb7ff932edf51c328aaf9c3c8a8a2b7eb7.tar.bz2 | |
Add temporary TabStripWrapper interface that is implemented by both TabStrip and BrowserTabStrip... this makes dealing with the multiple implementations more manageable in shared code like BrowserView, etc. This interface will die once the new work is completed and a conversion is finished. The interface contains all the methods that BrowserView expect to find on TabStrip.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/155242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame/glass_browser_frame_view.cc')
| -rw-r--r-- | chrome/browser/views/frame/glass_browser_frame_view.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index 48c1695..d7c8139 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -9,7 +9,7 @@ #include "app/theme_provider.h" #include "chrome/browser/browser_theme_provider.h" #include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/tabs/tab_strip.h" +#include "chrome/browser/views/tabs/tab_strip_wrapper.h" #include "grit/app_resources.h" #include "grit/theme_resources.h" #include "views/window/client_view.h" @@ -79,7 +79,7 @@ GlassBrowserFrameView::~GlassBrowserFrameView() { // GlassBrowserFrameView, BrowserNonClientFrameView implementation: gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip( - TabStrip* tabstrip) const { + TabStripWrapper* tabstrip) const { int minimize_button_offset = frame_->GetMinimizeButtonOffset(); int tabstrip_x = browser_view_->ShouldShowOffTheRecordAvatar() ? (otr_avatar_bounds_.right() + kOTRSideSpacing) : @@ -95,7 +95,8 @@ gfx::Rect GlassBrowserFrameView::GetBoundsForTabStrip( if (UILayoutIsRightToLeft()) tabstrip_width += tabstrip_x; return gfx::Rect(tabstrip_x, NonClientTopBorderHeight(), - std::max(0, tabstrip_width), tabstrip->GetPreferredHeight()); + std::max(0, tabstrip_width), + tabstrip->GetPreferredHeight()); } void GlassBrowserFrameView::UpdateThrobber(bool running) { |