Make the code for unmaximizing the window during SetBounds much simpler.

views/widget/widget_win.cc

 // Copyright (c) 2011 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 "views/widget/widget_win.h"
 
 #include "app/l10n_util_win.h"
 #include "app/system_monitor.h"
 #include "app/view_prop.h"
 #include "app/win/hwnd_util.h"
@@ skipping 221 matching lines @@
   }
 
   GetClientRect(&crect);
   POINT p = {0, 0};
   ClientToScreen(hwnd(), &p);
   out->SetRect(crect.left + p.x, crect.top + p.y,
                crect.Width(), crect.Height());
 }
 
 void WidgetWin::SetBounds(const gfx::Rect& bounds) {
-  if (IsZoomed())
-    ShowWindow(SW_SHOWNOACTIVATE);
+  LONG style = GetWindowLong(GWL_STYLE);
+  if (style & WS_MAXIMIZE)
+    SetWindowLong(GWL_STYLE, style & ~WS_MAXIMIZE);
   SetWindowPos(NULL, bounds.x(), bounds.y(), bounds.width(), bounds.height(),
                SWP_NOACTIVATE | SWP_NOZORDER);
 }
 
 void WidgetWin::MoveAbove(Widget* other) {
   gfx::Rect bounds;
   GetBounds(&bounds, false);
   SetWindowPos(other->GetNativeView(), bounds.x(), bounds.y(),
                bounds.width(), bounds.height(), SWP_NOACTIVATE);
 }
@@ skipping 1105 matching lines @@
 Widget* Widget::GetWidgetFromNativeWindow(gfx::NativeWindow native_window) {
   return Widget::GetWidgetFromNativeView(native_window);
 }
 
 // static
 void Widget::NotifyLocaleChanged() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace views