Merge r12930....

chrome/browser/views/frame/browser_frame.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/browser/views/frame/browser_frame.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "chrome/browser/browser_list.h"
@@ skipping 147 matching lines @@
   } else if (!browser_view_->IsFullscreen()) {
     // We draw our own client edge over part of the default frame would be.
     border_thickness = GetSystemMetrics(SM_CXSIZEFRAME) - kClientEdgeThickness;
   }
   client_rect->left += border_thickness;
   client_rect->right -= border_thickness;
   client_rect->bottom -= border_thickness;
 
   UpdateDWMFrame();
 
+  // Non-client metrics such as the window control positions may change as a
+  // result of us processing this message so we need to re-layout the frame view
+  // which may position items (such as the distributor logo) based on these
+  // metrics. We only do this once the non-client view has been properly
+  // initialized and added to the view hierarchy.
+  views::NonClientView* non_client_view = GetNonClientView();
+  if (non_client_view && non_client_view->GetParent())
+    non_client_view->LayoutFrameView();
+
   // We'd like to return WVR_REDRAW in some cases here, but because we almost
   // always have nonclient area (except in fullscreen mode, where it doesn't
   // matter), we can't.  See comments in window.cc:OnNCCalcSize() for more info.
   return 0;
 }
 
 LRESULT BrowserFrame::OnNCHitTest(const CPoint& pt) {
   // Only do DWM hit-testing when we are using the native frame.
   if (GetNonClientView()->UseNativeFrame()) {
     LRESULT result;
@@ skipping 48 matching lines @@
     margins.cyBottomHeight = kClientEdgeThickness + 1;
   }
   // In maximized mode, we only have a titlebar strip of glass, no side/bottom
   // borders.
   if (!browser_view_->IsFullscreen()) {
     margins.cyTopHeight =
         GetBoundsForTabStrip(browser_view_->tabstrip()).bottom();
   }
   DwmExtendFrameIntoClientArea(GetNativeView(), &margins);
 }