summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/frame/browser_frame_win.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 01:34:34 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-05 01:34:34 +0000
commitb608d84596f658c901d2936aee107041ecf5e4cd (patch)
tree0e07a5426286d80a702b3c6635a6e0ae8b6c5c3f /chrome/browser/views/frame/browser_frame_win.cc
parent5fc6a04194611a82da93902458fa2b2a16fa1728 (diff)
downloadchromium_src-b608d84596f658c901d2936aee107041ecf5e4cd.zip
chromium_src-b608d84596f658c901d2936aee107041ecf5e4cd.tar.gz
chromium_src-b608d84596f658c901d2936aee107041ecf5e4cd.tar.bz2
Make the side tabstrip participate in the layout of the BrowserView.
Turn on the side tabstrip by default when --enable-vertical-tabs is specified, for ease of testing/debugging. Adjust glass rendering in this mode. http://crbug.com/34509 TEST=none Review URL: http://codereview.chromium.org/570029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38160 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.cc12
1 files changed, 10 insertions, 2 deletions
diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
index c79c415..ddfe7ba 100644
--- a/chrome/browser/views/frame/browser_frame_win.cc
+++ b/chrome/browser/views/frame/browser_frame_win.cc
@@ -273,12 +273,20 @@ void BrowserFrameWin::UpdateDWMFrame() {
margins.cxLeftWidth = kClientEdgeThickness + 1;
margins.cxRightWidth = kClientEdgeThickness + 1;
margins.cyBottomHeight = kClientEdgeThickness + 1;
+ margins.cyTopHeight = kClientEdgeThickness + 1;
}
// In maximized mode, we only have a titlebar strip of glass, no side/bottom
// borders.
if (!browser_view_->IsFullscreen()) {
- margins.cyTopHeight =
- GetBoundsForTabStrip(browser_view_->tabstrip()).bottom();
+ if (browser_view_->UsingSideTabs()) {
+ margins.cxLeftWidth +=
+ GetBoundsForTabStrip(browser_view_->tabstrip()).right();
+ margins.cyTopHeight +=
+ GetSystemMetrics(SM_CYSIZEFRAME) + GetSystemMetrics(SM_CYCAPTION);
+ } else {
+ margins.cyTopHeight =
+ GetBoundsForTabStrip(browser_view_->tabstrip()).bottom();
+ }
}
} else {
// For popup and app windows we want to use the default margins.