diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-20 00:19:19 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-20 00:19:19 +0000 |
| commit | 02b0702ddbc1ffdea4dffcedd4d70274f1be38fa (patch) | |
| tree | 71aa3cde9ef5b5a115575b666faf7f32bd483f9a /chrome/browser/views/frame/browser_view_layout.cc | |
| parent | 71cbae7bdfed9c023c21c37bf4551a8d18dfa3d2 (diff) | |
| download | chromium_src-02b0702ddbc1ffdea4dffcedd4d70274f1be38fa.zip chromium_src-02b0702ddbc1ffdea4dffcedd4d70274f1be38fa.tar.gz chromium_src-02b0702ddbc1ffdea4dffcedd4d70274f1be38fa.tar.bz2 | |
Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs mode.
Reliability bot and Linux CrOS browser_tests all had crashes in ~TabStrip.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/1141005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame/browser_view_layout.cc')
| -rw-r--r-- | chrome/browser/views/frame/browser_view_layout.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/browser_view_layout.cc b/chrome/browser/views/frame/browser_view_layout.cc index e632534..2c11574 100644 --- a/chrome/browser/views/frame/browser_view_layout.cc +++ b/chrome/browser/views/frame/browser_view_layout.cc @@ -285,7 +285,7 @@ int BrowserViewLayout::LayoutTabStrip() { gfx::Rect layout_bounds = browser_view_->frame()->GetBoundsForTabStrip(tabstrip_); - if (browser_view_->UseVerticalTabs()) { + if (browser_view_->UsingSideTabs()) { vertical_layout_rect_.Inset( layout_bounds.right() - kBrowserViewTabStripHorizontalOverlap, 0, 0, 0); } else { @@ -301,7 +301,7 @@ int BrowserViewLayout::LayoutTabStrip() { layout_bounds.set_origin(tabstrip_origin); tabstrip_->SetVisible(true); tabstrip_->SetBounds(layout_bounds); - return browser_view_->UseVerticalTabs() ? 0 : layout_bounds.bottom(); + return browser_view_->UsingSideTabs() ? 0 : layout_bounds.bottom(); } int BrowserViewLayout::LayoutToolbar(int top) { @@ -309,7 +309,7 @@ int BrowserViewLayout::LayoutToolbar(int top) { bool visible = browser_view_->IsToolbarVisible(); toolbar_->location_bar()->SetFocusable(visible); int y = 0; - if (!browser_view_->UseVerticalTabs()) { + if (!browser_view_->UsingSideTabs()) { y = top - ((visible && browser_view_->IsTabStripVisible()) ? kToolbarTabStripVerticalOverlap : 0); |