ash: Disable window caption buttons in immersive mode

ash/wm/frame_painter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ skipping 304 matching lines @@
 gfx::Size FramePainter::GetMinimumSize(views::NonClientFrameView* view) {
   gfx::Size min_size = frame_->client_view()->GetMinimumSize();
   // Ensure we can display the top of the caption area.
   gfx::Rect client_bounds = view->GetBoundsForClientView();
   min_size.Enlarge(0, client_bounds.y());
   // Ensure we have enough space for the window icon and buttons.  We allow
   // the title string to collapse to zero width.
   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);
   return min_size;
 }
 
 gfx::Size FramePainter::GetMaximumSize(views::NonClientFrameView* view) {
   return frame_->client_view()->GetMaximumSize();
 }
 
 int FramePainter::GetRightInset() const {
   gfx::Size close_size = close_button_->GetPreferredSize();
   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;
   }
   return inset;
 }
 
 int FramePainter::GetThemeBackgroundXInset() const {
   return kThemeFrameImageInsetX;
 }
 
@@ skipping 521 matching lines @@
   int title_y =
       (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash