Merge 143447 - On Windows 8 when a metro application is snapped running desktop application windows…

chrome/browser/ui/views/frame/browser_frame_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_BROWSER_FRAME_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 42 matching lines @@
                                UINT position,
                                BOOL is_system_menu) OVERRIDE;
   virtual void OnWindowPosChanged(WINDOWPOS* window_pos) OVERRIDE;
   virtual void OnScreenReaderDetected() OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void ShowMaximizedWithBounds(
       const gfx::Rect& restored_bounds) OVERRIDE;
   virtual void ShowWithWindowState(ui::WindowShowState show_state) OVERRIDE;
   virtual void Close() OVERRIDE;
+  virtual void OnActivate(UINT action, BOOL minimized, HWND window) OVERRIDE;
 
   // Overridden from NativeBrowserFrame:
   virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
   virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
   virtual void InitSystemContextMenu() OVERRIDE;
   virtual int GetMinimizeButtonOffset() const OVERRIDE;
   virtual void TabStripDisplayModeChanged() OVERRIDE;
 
   // Overriden from views::ImageButton override:
   virtual void ButtonPressed(views::Button* sender,
@@ skipping 21 matching lines @@
   // Returns information about the currently displayed tab in metro mode.
   void GetMetroCurrentTabInfo(WPARAM w_param);
 
   // Ensures that the window frame follows the Windows 8 metro app guidelines,
   // i.e. no system menu, etc.
   void AdjustFrameForImmersiveMode();
 
   // Called when the frame is closed. Only applies to Windows 8 metro mode.
   void CloseImmersiveFrame();
 
+  // Calculates and caches the minimize button delta, i.e. the offset to be
+  // applied to the left/right coordinates of the client rectangle in case
+  // we fail to retrieve the offset of the minimize button.
+  void CacheMinimizeButtonDelta();
+
   // The BrowserView is our ClientView. This is a pointer to it.
   BrowserView* browser_view_;
 
   BrowserFrame* browser_frame_;
 
   // The additional items we insert into the system menu.
   scoped_ptr<SystemMenuModelDelegate> system_menu_delegate_;
   scoped_ptr<SystemMenuModel> system_menu_contents_;
   scoped_ptr<ZoomMenuModel> zoom_menu_contents_;
   scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
   // The wrapped system menu itself.
   scoped_ptr<views::NativeMenuWin> system_menu_;
 
+  // See CacheMinimizeButtonDelta() for details about this member.
+  int cached_minimize_button_x_delta_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_