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_frame_win.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_frame_win.cc')
| -rw-r--r-- | chrome/browser/views/frame/browser_frame_win.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc index 4578829..696e109 100644 --- a/chrome/browser/views/frame/browser_frame_win.cc +++ b/chrome/browser/views/frame/browser_frame_win.cc @@ -69,6 +69,9 @@ views::Window* BrowserFrameWin::GetWindow() { return this; } +void BrowserFrameWin::TabStripCreated(BaseTabStrip* tabstrip) { +} + int BrowserFrameWin::GetMinimizeButtonOffset() const { TITLEBARINFOEX titlebar_info; titlebar_info.cbSize = sizeof(TITLEBARINFOEX); @@ -124,14 +127,6 @@ void BrowserFrameWin::PaintTabStripShadow(gfx::Canvas* canvas) { browser_frame_view_->PaintTabStripShadow(canvas); } -void BrowserFrameWin::TabStripDisplayModeChanged() { - UpdateDWMFrame(); - // We need to relayout only after the window frame has had a chance to update - // the size/position of its controls (e.g. minimize/maximize/close) so that - // the tabstrip can layout at its correct bounds. - GetRootView()->Layout(); -} - /////////////////////////////////////////////////////////////////////////////// // BrowserFrame, views::WindowWin overrides: @@ -299,7 +294,7 @@ void BrowserFrameWin::UpdateDWMFrame() { // In maximized mode, we only have a titlebar strip of glass, no side/bottom // borders. if (!browser_view_->IsFullscreen()) { - if (browser_view_->UseVerticalTabs()) { + if (browser_view_->UsingSideTabs()) { margins.cxLeftWidth += GetBoundsForTabStrip(browser_view_->tabstrip()).right(); margins.cyTopHeight += GetSystemMetrics(SM_CYSIZEFRAME); @@ -314,7 +309,7 @@ void BrowserFrameWin::UpdateDWMFrame() { DwmExtendFrameIntoClientArea(GetNativeView(), &margins); DWORD window_style = GetWindowLong(GWL_STYLE); - if (browser_view_->UseVerticalTabs()) { + if (browser_view_->UsingSideTabs()) { if (window_style & WS_CAPTION) SetWindowLong(GWL_STYLE, window_style & ~WS_CAPTION); } else { |