ash: Disable window caption buttons in immersive mode

Set them invisible when immersive mode is enabled, but show them when we reveal the toolbar.

Also ensure the caption buttons don't reserve too much horizontal space when the immersive mode button is invisible. Otherwise the tab strip doesn't have enough space.

BUG=168855
TEST=added browser_tests BrowserNonClientFrameViewAshTest.ImmersiveMode

Review URL: https://codereview.chromium.org/11826068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176751 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 5ccda29..b680069 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -322,7 +322,7 @@ gfx::Size FramePainter::GetMinimumSize(views::NonClientFrameView* view) {
   int title_width = GetTitleOffsetX() +
       size_button_->width() + kSizeButtonOffsetX +
       close_button_->width() + kCloseButtonOffsetX;
-  if (immersive_button_)
+  if (immersive_button_ && immersive_button_->visible())
     title_width += immersive_button_->width() + kImmersiveButtonOffsetX;
   if (title_width > min_size.width())
     min_size.set_width(title_width);
@@ -338,7 +338,7 @@ int FramePainter::GetRightInset() const {
   gfx::Size size_button_size = size_button_->GetPreferredSize();
   int inset = close_size.width() + kCloseButtonOffsetX +
       size_button_size.width() + kSizeButtonOffsetX;
-  if (immersive_button_) {
+  if (immersive_button_ && immersive_button_->visible()) {
     gfx::Size immersive_size = immersive_button_->GetPreferredSize();
     inset += immersive_size.width() + kImmersiveButtonOffsetX;
   }