Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: chrome/browser/views/frame/glass_browser_frame_view.cc

Issue 42027: Make Chromium windows not hide auto-hide taskbars, take 2.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/views/frame/glass_browser_frame_view.cc
===================================================================
--- chrome/browser/views/frame/glass_browser_frame_view.cc (revision 11284)
+++ chrome/browser/views/frame/glass_browser_frame_view.cc (working copy)
@@ -225,7 +225,8 @@
PaintDistributorLogo(canvas);
PaintToolbarBackground(canvas);
PaintOTRAvatar(canvas);
- PaintClientEdge(canvas);
+ if (!frame_->IsMaximized())
+ PaintRestoredClientEdge(canvas);
}
void GlassBrowserFrameView::Layout() {
@@ -238,16 +239,22 @@
// GlassBrowserFrameView, private:
int GlassBrowserFrameView::FrameBorderThickness() const {
- return GetSystemMetrics(SM_CXSIZEFRAME);
+ return browser_view_->CanCurrentlyResize() ?
+ GetSystemMetrics(SM_CXSIZEFRAME) : 0;
}
int GlassBrowserFrameView::NonClientBorderThickness() const {
- return kNonClientBorderThickness;
+ return browser_view_->CanCurrentlyResize() ? kNonClientBorderThickness : 0;
}
int GlassBrowserFrameView::NonClientTopBorderHeight() const {
- return FrameBorderThickness() +
- (frame_->IsMaximized() ? 0 : kNonClientRestoredExtraThickness);
+ if (browser_view_->IsFullscreen())
+ return 0;
+ // We'd like to use FrameBorderThickness() here, but the maximized Aero glass
+ // frame has a 0 frame border around most edges and a CXSIZEFRAME-thick border
+ // at the top (see AeroGlassFrame::OnGetMinMaxInfo()).
+ return GetSystemMetrics(SM_CXSIZEFRAME) +
+ (browser_view_->IsMaximized() ? 0 : kNonClientRestoredExtraThickness);
}
void GlassBrowserFrameView::PaintDistributorLogo(ChromeCanvas* canvas) {
@@ -295,7 +302,7 @@
otr_avatar_bounds_.width(), otr_avatar_bounds_.height(), false);
}
-void GlassBrowserFrameView::PaintClientEdge(ChromeCanvas* canvas) {
+void GlassBrowserFrameView::PaintRestoredClientEdge(ChromeCanvas* canvas) {
// The client edges start below the toolbar upper corner images regardless
// of how tall the toolbar itself is.
int client_area_top =
« no previous file with comments | « chrome/browser/views/frame/glass_browser_frame_view.h ('k') | chrome/browser/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698