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

Unified Diff: chrome/browser/views/frame/opaque_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/glass_browser_frame_view.cc ('k') | chrome/browser/window_sizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/frame/opaque_browser_frame_view.cc
===================================================================
--- chrome/browser/views/frame/opaque_browser_frame_view.cc (revision 13759)
+++ chrome/browser/views/frame/opaque_browser_frame_view.cc (working copy)
@@ -463,7 +463,7 @@
gfx::Point system_menu_point(
MirroredXCoordinateInsideView(FrameBorderThickness()),
NonClientTopBorderHeight() + browser_view_->GetTabStripHeight() -
- (browser_view_->IsFullscreen() ? 0 : kClientEdgeThickness));
+ (frame_->IsFullscreen() ? 0 : kClientEdgeThickness));
ConvertPointToScreen(this, &system_menu_point);
return system_menu_point;
}
@@ -503,7 +503,7 @@
gfx::Path* window_mask) {
DCHECK(window_mask);
- if (!browser_view_->CanCurrentlyResize())
+ if (frame_->IsMaximized() || frame_->IsFullscreen())
return;
// Redefine the window visible region for the new size.
@@ -540,7 +540,7 @@
// OpaqueBrowserFrameView, views::View overrides:
void OpaqueBrowserFrameView::Paint(ChromeCanvas* canvas) {
- if (browser_view_->IsFullscreen())
+ if (frame_->IsFullscreen())
return; // Nothing is visible, so don't bother to paint.
if (frame_->IsMaximized())
@@ -647,7 +647,8 @@
// OpaqueBrowserFrameView, private:
int OpaqueBrowserFrameView::FrameBorderThickness() const {
- return browser_view_->CanCurrentlyResize() ? kFrameBorderThickness : 0;
+ return (frame_->IsMaximized() || frame_->IsFullscreen()) ?
+ 0 : kFrameBorderThickness;
}
int OpaqueBrowserFrameView::TopResizeHeight() const {
@@ -657,7 +658,8 @@
int OpaqueBrowserFrameView::NonClientBorderThickness() const {
// When we fill the screen, we don't show a client edge.
return FrameBorderThickness() +
- (browser_view_->CanCurrentlyResize() ? kClientEdgeThickness : 0);
+ ((frame_->IsMaximized() || frame_->IsFullscreen()) ?
+ 0 : kClientEdgeThickness);
}
int OpaqueBrowserFrameView::NonClientTopBorderHeight() const {
@@ -666,8 +668,9 @@
return TitleCoordinates(&title_top_spacing, &title_thickness);
}
- return FrameBorderThickness() + (browser_view_->CanCurrentlyResize() ?
- kNonClientRestoredExtraThickness : 0);
+ return FrameBorderThickness() +
+ ((frame_->IsMaximized() || frame_->IsFullscreen()) ?
+ 0 : kNonClientRestoredExtraThickness);
}
int OpaqueBrowserFrameView::UnavailablePixelsAtBottomOfNonClientHeight() const {
« no previous file with comments | « chrome/browser/views/frame/glass_browser_frame_view.cc ('k') | chrome/browser/window_sizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698