summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-08 21:26:12 +0000
committerjeremya@chromium.org <jeremya@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-08 21:26:12 +0000
commit02c95898a1a8aec147dffa9d6aa55da3eeeead12 (patch)
tree06e3e66cb5a671a01dcc4a2eca4ff167d388effc
parentfb52d25a47d4200c0a19ac93bc3ddcae7bcbdc8d (diff)
downloadchromium_src-02c95898a1a8aec147dffa9d6aa55da3eeeead12.zip
chromium_src-02c95898a1a8aec147dffa9d6aa55da3eeeead12.tar.gz
chromium_src-02c95898a1a8aec147dffa9d6aa55da3eeeead12.tar.bz2
Don't show the titlebar in fullscreen windows on ash.
R=ben@chromium.org BUG=153475 Review URL: https://chromiumcodereview.appspot.com/11028074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160708 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ash/wm/custom_frame_view_ash.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc
index 77977f2..a7f7517 100644
--- a/ash/wm/custom_frame_view_ash.cc
+++ b/ash/wm/custom_frame_view_ash.cc
@@ -125,6 +125,9 @@ void CustomFrameViewAsh::Layout() {
}
void CustomFrameViewAsh::OnPaint(gfx::Canvas* canvas) {
+ if (frame_->IsFullscreen())
+ return;
+
bool paint_as_active = ShouldPaintAsActive();
int theme_image_id = paint_as_active ? IDR_AURA_WINDOW_HEADER_BASE_ACTIVE :
IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
@@ -171,6 +174,9 @@ void CustomFrameViewAsh::ButtonPressed(views::Button* sender,
// CustomFrameViewAsh, private:
int CustomFrameViewAsh::NonClientTopBorderHeight() const {
+ if (frame_->IsFullscreen())
+ return 0;
+
// Reserve enough space to see the buttons, including any offset from top and
// reserving space for the separator line.
return close_button_->bounds().bottom() +