diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 23:34:34 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-17 23:34:34 +0000 |
| commit | 7e5d5f78648213b56eeb2137a3ae9432bfd09e2e (patch) | |
| tree | 4f65cb060b840e748599288592d7b2f63639e43a | |
| parent | 157f9aceff900f6538b0aa7a2a865e98e77272a1 (diff) | |
| download | chromium_src-7e5d5f78648213b56eeb2137a3ae9432bfd09e2e.zip chromium_src-7e5d5f78648213b56eeb2137a3ae9432bfd09e2e.tar.gz chromium_src-7e5d5f78648213b56eeb2137a3ae9432bfd09e2e.tar.bz2 | |
Merge 56450 - Fix parentheses omission which led to tab misplacement in maximized mode. Also remove an extra pair of parentheses that snuck in.
TBR=jcivelli
BUG=none
TEST=When maximized with a custom theme, tabs should be at the top of the screen
Review URL: http://codereview.chromium.org/3191006
TBR=pkasting@chromium.org
Review URL: http://codereview.chromium.org/3169020
git-svn-id: svn://svn.chromium.org/chrome/branches/472/src@56452 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/views/frame/opaque_browser_frame_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 885a7b1..2dc21b7 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -495,14 +495,14 @@ int OpaqueBrowserFrameView::NonClientTopBorderHeight() const { } return FrameBorderThickness() - - (browser_view_->IsTabStripVisible() && window->IsMaximized()) ? - kTabstripTopShadowThickness : 0; + ((browser_view_->IsTabStripVisible() && window->IsMaximized()) ? + kTabstripTopShadowThickness : 0); } int OpaqueBrowserFrameView::CaptionButtonY() const { // Maximized buttons start at window top so that even if their images aren't // drawn flush with the screen edge, they still obey Fitts' Law. - return (frame_->GetWindow()->IsMaximized()) ? + return frame_->GetWindow()->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness; } |