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

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

Issue 78002: Reorganize fullscreen mode handling. Now nearly everything is in WindowWin. ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 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
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('k') | chrome/browser/views/frame/opaque_browser_frame_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/frame/glass_browser_frame_view.cc
===================================================================
--- chrome/browser/views/frame/glass_browser_frame_view.cc (revision 13759)
+++ chrome/browser/views/frame/glass_browser_frame_view.cc (working copy)
@@ -184,9 +184,10 @@
// (where we don't do this trick) maximized windows have no client edge and
// only the frame edge is offscreen.
system_menu_point.SetPoint(NonClientBorderThickness() -
- (browser_view_->CanCurrentlyResize() ? kClientEdgeThickness : 0),
+ ((frame_->IsMaximized() || frame_->IsFullscreen()) ?
+ 0 : kClientEdgeThickness),
NonClientTopBorderHeight() + browser_view_->GetTabStripHeight() -
- (browser_view_->IsFullscreen() ? 0 : kClientEdgeThickness));
+ (frame_->IsFullscreen() ? 0 : kClientEdgeThickness));
} else {
system_menu_point.SetPoint(0, -kFrameShadowThickness);
}
@@ -239,16 +240,17 @@
// GlassBrowserFrameView, private:
int GlassBrowserFrameView::FrameBorderThickness() const {
- return browser_view_->CanCurrentlyResize() ?
- GetSystemMetrics(SM_CXSIZEFRAME) : 0;
+ return (frame_->IsMaximized() || frame_->IsFullscreen()) ?
+ 0 : GetSystemMetrics(SM_CXSIZEFRAME);
}
int GlassBrowserFrameView::NonClientBorderThickness() const {
- return browser_view_->CanCurrentlyResize() ? kNonClientBorderThickness : 0;
+ return (frame_->IsMaximized() || frame_->IsFullscreen()) ?
+ 0 : kNonClientBorderThickness;
}
int GlassBrowserFrameView::NonClientTopBorderHeight() const {
- if (browser_view_->IsFullscreen())
+ if (frame_->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
« no previous file with comments | « chrome/browser/views/frame/browser_view.cc ('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