Merge 146921 - On Windows 8 when a metro app is snapped, all desktop applications receive a resize …

chrome/browser/ui/views/frame/browser_frame_win.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <set>
 
@@ skipping 281 matching lines @@
     BuildSystemMenuForAppOrPopupWindow();
   system_menu_.reset(
       new views::NativeMenuWin(system_menu_contents_.get(), GetNativeWindow()));
   system_menu_->Rebuild();
 }
 
 int BrowserFrameWin::GetMinimizeButtonOffset() const {
   int minimize_button_offset =
       GetMinimizeButtonOffsetForWindow(GetNativeView());
 
-  if (minimize_button_offset)
+  if (minimize_button_offset > 0)
     return minimize_button_offset;
 
   // If we fail to get the minimize button offset via the WM_GETTITLEBARINFOEX
   // message then calculate and return this via the
   // cached_minimize_button_x_delta_ member value. Please see
   // CacheMinimizeButtonDelta() for more details.
   DCHECK(cached_minimize_button_x_delta_);
 
   RECT client_rect = {0};
   GetClientRect(&client_rect);
@@ skipping 253 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }