Merge r12930....

chrome/views/window/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/window/non_client_view.h"
 
 #include "chrome/common/win_util.h"
 #include "chrome/views/widget/root_view.h"
 #include "chrome/views/widget/widget.h"
 #include "chrome/views/window/window.h"
@@ skipping 94 matching lines @@
 }
 
 void NonClientView::EnableClose(bool enable) {
   frame_view_->EnableClose(enable);
 }
 
 void NonClientView::ResetWindowControls() {
   frame_view_->ResetWindowControls();
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NonClientView, View overrides:
-
-gfx::Size NonClientView::GetPreferredSize() {
-  gfx::Rect client_bounds(gfx::Point(), client_view_->GetPreferredSize());
-  return GetWindowBoundsForClientBounds(client_bounds).size();
-}
-
-void NonClientView::Layout() {
+void NonClientView::LayoutFrameView() {
   // 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();
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// NonClientView, View overrides:
+
+gfx::Size NonClientView::GetPreferredSize() {
+  gfx::Rect client_bounds(gfx::Point(), client_view_->GetPreferredSize());
+  return GetWindowBoundsForClientBounds(client_bounds).size();
+}
+
+void NonClientView::Layout() {
+  LayoutFrameView();
 
   // 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,
@@ skipping 89 matching lines @@
   } else {
     return HTNOWHERE;
   }
 
   // If the window can't be resized, there are no resize boundaries, just
   // window borders.
   return can_resize ? component : HTBORDER;
 }
 
 }  // namespace views