Fix for 504133 - wandering identity switcher button

chrome/browser/ui/views/frame/minimize_button_metrics_win.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_MINIMIZE_BUTTON_METRICS_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_MINIMIZE_BUTTON_METRICS_WIN_H_
 
 #include <windows.h>
 
 #include "base/macros.h"
@@ skipping 15 matching lines @@
   int GetMinimizeButtonOffsetX() const;
 
   // Must be called when hwnd_ is activated to update the minimize button
   // position cache.
   void OnHWNDActivated();
 
  private:
   // Gets the value for GetMinimizeButtonOffsetX(), caching if found.
   int GetAndCacheMinimizeButtonOffsetX() const;
 
+  int GetButtonBoundsPositionOffset(const RECT& button_bounds,
+                                    const RECT& window_bounds) const;
+
+  int GetMinimizeButtonOffsetForWindow() const;
+
   HWND hwnd_;
 
   // Cached offset of the minimize button. If RTL this is the location of the
   // minimize button, if LTR this is the offset from the right edge of the
   // client area to the minimize button.
   mutable int cached_minimize_button_x_delta_;
 
   // Static cache of |cached_minimize_button_x_delta_|.
   static int last_cached_minimize_button_x_delta_;
 
+  // Static cache of offset value representing the different between
+  // DWMWA_CAPTION_BUTTON_BOUNDS and WM_GETTITLEBARINFOEX
+  static int button_bounds_position_offset_;
+
   // Has OnHWNDActivated() been invoked?
   bool was_activated_;
 
   DISALLOW_COPY_AND_ASSIGN(MinimizeButtonMetrics);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_MINIMIZE_BUTTON_METRICS_WIN_H_