Merge r11424...

chrome/views/non_client_view.cc

 // Copyright (c) 2006-2008 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/views/non_client_view.h"
 
 #include "chrome/common/win_util.h"
 #include "chrome/views/root_view.h"
 #include "chrome/views/window.h"
 
@@ skipping 133 matching lines @@
 gfx::Size NonClientView::GetPreferredSize() {
   gfx::Rect client_bounds(gfx::Point(), client_view_->GetPreferredSize());
   return GetWindowBoundsForClientBounds(client_bounds).size();
 }
 
 void NonClientView::Layout() {
   // First layout the NonClientFrameView, which determines the size of the
   // ClientView...
   frame_view_->SetBounds(0, 0, width(), height());
 
+  // We need to manually call Layout here because layout for the frame view can
+  // change independently of the bounds changing - e.g. after the initial
+  // display of the window the metrics of the native window controls can change,
+  // which does not change the bounds of the window but requires a re-layout to
+  // trigger a repaint. We override DidChangeBounds for the NonClientFrameView
+  // to do nothing so that SetBounds above doesn't cause Layout to be called
+  // twice.
+  frame_view_->Layout();
+
   // Then layout the ClientView, using those bounds.
   client_view_->SetBounds(frame_view_->GetBoundsForClientView());
+
+  // We need to manually call Layout on the ClientView as well for the same
+  // reason as above.
+  client_view_->Layout();
 }
 
 void NonClientView::ViewHierarchyChanged(bool is_add, View* parent,
                                          View* child) {
   // Add our two child views here as we are added to the Widget so that if we
   // are subsequently resized all the parent-child relationships are
   // established.
   if (is_add && GetWidget() && child == this) {
     AddChildView(kFrameViewIndex, frame_view_.get());
     AddChildView(kClientViewIndex, client_view_);
@@ skipping 23 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, View overrides:
 
 bool NonClientFrameView::HitTest(const gfx::Point& l) const {
   // For the default case, we assume the non-client frame view never overlaps
   // the client view.
   return !GetWidget()->AsWindow()->client_view()->bounds().Contains(l);
 }
 
+void NonClientFrameView::DidChangeBounds(const gfx::Rect& previous,
+                                         const gfx::Rect& current) {
+  // Overridden to do nothing. The NonClientView manually calls Layout on the
+  // FrameView when it is itself laid out, see comment in NonClientView::Layout.
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView, protected:
 
 int NonClientFrameView::GetHTComponentForFrame(const gfx::Point& point,
                                                int top_resize_border_height,
                                                int resize_border_thickness,
                                                int top_resize_corner_height,
                                                int resize_corner_width,
                                                bool can_resize) {
   // Tricky: In XP, native behavior is to return HTTOPLEFT and HTTOPRIGHT for
@@ skipping 34 matching lines @@
     return HTNOWHERE;
   }
 
   // If the window can't be resized, there are no resize boundaries, just
   // window borders.
   return can_resize ? component : HTBORDER;
 }
 
 }  // namespace views