Fix issue once and for all where distributor logo overlays window controls. N...

chrome/browser/views/frame/browser_frame_win.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_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 
 #include "app/resource_bundle.h"
@@ skipping 209 matching lines @@
   if (GetNonClientView()->UseNativeFrame()) {
     LRESULT result;
     if (DwmDefWindowProc(GetNativeView(), WM_NCHITTEST, 0,
                          MAKELPARAM(pt.x, pt.y), &result)) {
       return result;
     }
   }
   return WindowWin::OnNCHitTest(pt);
 }
 
+void BrowserFrameWin::OnWindowPosChanged(WINDOWPOS* window_pos) {
+  // Windows lies to us about the position of the minimize button before a
+  // window is visible. We use the position of the minimize button to place the
+  // distributor logo in official builds. When the window is shown, we need to
+  // re-layout and schedule a paint for the non-client frame view so that the
+  // distributor logo has the correct position when the window becomes visible.
+  // This fixes bugs where the distributor logo appears to overlay the minimize
+  // button. http://crbug.com/15520
+  // Note that we will call Layout every time SetWindowPos is called with
+  // SWP_SHOWWINDOW, however callers typically are careful about not specifying
+  // this flag unless necessary to avoid flicker.
+  if (window_pos->flags & SWP_SHOWWINDOW) {
+    GetNonClientView()->Layout();
+    GetNonClientView()->SchedulePaint();
+  }
+  WindowWin::OnWindowPosChanged(window_pos);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrame, views::CustomFrameWindow overrides:
 
 int BrowserFrameWin::GetShowState() const {
   return browser_view_->GetShowState();
 }
 
 views::NonClientFrameView* BrowserFrameWin::CreateFrameViewForWindow() {
   if (GetThemeProvider()->ShouldUseNativeFrame())
     browser_frame_view_ = new GlassBrowserFrameView(this, browser_view_);
@@ skipping 31 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);
 }