Aura: Switch window mode when screen resolution changes

chrome/browser/ui/views/frame/opaque_browser_frame_view.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 "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 960 matching lines @@
         close_button_->SetVisible(false);
         // Set the bounds of the minimize button so that we don't have to change
         // other places that rely on the bounds. Put it slightly to the right
         // of the edge of the view, so that when we remove the spacing it lines
         // up with the edge.
         minimize_button_->SetBounds(width() - FrameBorderThickness(false) +
             kNewTabCaptionMaximizedSpacing, 0, 0, 0);
       }
       return;
     }
-    close_button_->SetVisible(true);
   }
+  // Aura can transition in and out of single-window mode, so be sure the
+  // close button is visible after the change.
+  close_button_->SetVisible(true);
 
   // When the window is restored, we show a maximized button; otherwise, we show
   // a restore button.
   bool is_restored = !is_maximized && !frame()->IsMinimized();
   views::ImageButton* invisible_button = is_restored ?
       restore_button_ : maximize_button_;
   invisible_button->SetVisible(false);
 
   views::ImageButton* visible_button = is_restored ?
       maximize_button_ : restore_button_;
@@ skipping 68 matching lines @@
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - GetReservedHeight() -
                        top_height - border_thickness));
 }