ash: Fix blank window when maximizing an app

ui/views/window/non_client_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 "ui/views/window/non_client_view.h"
 
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
@@ skipping 41 matching lines @@
 }
 
 bool NonClientView::CanClose() {
   return client_view_->CanClose();
 }
 
 void NonClientView::WindowClosing() {
   client_view_->WidgetClosing();
 }
 
-void NonClientView::UpdateFrame() {
+void NonClientView::UpdateFrame(bool layout) {
   Widget* widget = GetWidget();
   SetFrameView(widget->CreateNonClientFrameView());
   widget->ThemeChanged();
-  Layout();
-  SchedulePaint();
+  if (layout) {
+    Layout();
+    SchedulePaint();
+  }
 }
 
 void NonClientView::SetInactiveRenderingDisabled(bool disable) {
   frame_view_->SetInactiveRenderingDisabled(disable);
 }
 
 gfx::Rect NonClientView::GetWindowBoundsForClientBounds(
     const gfx::Rect client_bounds) const {
   return frame_view_->GetWindowBoundsForClientBounds(client_bounds);
 }
@@ skipping 193 matching lines @@
 std::string NonClientFrameView::GetClassName() const {
   return kViewClassName;
 }
 
 void NonClientFrameView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // Overridden to do nothing. The NonClientView manually calls Layout on the
   // FrameView when it is itself laid out, see comment in NonClientView::Layout.
 }
 
 }  // namespace views