Fix Aero Basic (i.e. non-glass) maximized mode drawing. This old hack was in...

chrome/views/custom_frame_window.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/views/custom_frame_window.h"
 
 #include "base/gfx/point.h"
 #include "base/gfx/size.h"
 #include "base/win_util.h"
 #include "chrome/app/theme/theme_resources.h"
@@ skipping 840 matching lines @@
     active_resources_ = new ActiveWindowResources;
     inactive_resources_ = new InactiveWindowResources;
 
     title_font_ = win_util::GetWindowTitleFont();
 
     initialized = true;
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// NonClientViewLayout
-
-class NonClientViewLayout : public LayoutManager {
- public:
-  // The size of the default window border and padding used by Windows Vista
-  // with DWM disabled when clipping the window for maximized display.
-  // TODO(beng): figure out how to get this programmatically, since it varies
-  //             with adjustments to the Windows Border/Padding setting.
-  static const int kBorderAndPadding = 8;
-
-  NonClientViewLayout(View* child, Window* window)
-      : child_(child),
-        window_(window) {
-  }
-  virtual ~NonClientViewLayout() {}
-
-  // Overridden from LayoutManager:
-  virtual void Layout(View* host) {
-    int horizontal_border_width =
-        window_->IsMaximized() ? kBorderAndPadding : 0;
-    int vertical_border_height =
-        window_->IsMaximized() ? kBorderAndPadding : 0;
-
-    child_->SetBounds(horizontal_border_width, vertical_border_height,
-                      host->width() - (2 * horizontal_border_width),
-                      host->height() - (2 * vertical_border_height));
-  }
-  virtual gfx::Size GetPreferredSize(View* host) {
-    return child_->GetPreferredSize();
-  }
-
- private:
-  View* child_;
-  Window* window_;
-
-  DISALLOW_COPY_AND_ASSIGN(NonClientViewLayout);
-};
-
-///////////////////////////////////////////////////////////////////////////////
 // CustomFrameWindow, public:
 
 CustomFrameWindow::CustomFrameWindow(WindowDelegate* window_delegate)
     : Window(window_delegate),
       is_active_(false),
       lock_updates_(false),
       saved_window_style_(0) {
   InitClass();
   non_client_view_ = new DefaultNonClientView(this);
 }
@@ skipping 12 matching lines @@
 // CustomFrameWindow, Window overrides:
 
 void CustomFrameWindow::Init(HWND parent, const gfx::Rect& bounds) {
   // TODO(beng): (Cleanup) Right now, the only way to specify a different
   //             non-client view is to subclass this object and provide one
   //             by setting this member before calling Init.
   if (!non_client_view_)
     non_client_view_ = new DefaultNonClientView(this);
   Window::Init(parent, bounds);
 
-  // Windows Vista non-Aero-glass does wacky things with maximized windows that
-  // require a special layout manager to compensate for.
-  if (win_util::GetWinVersion() >= win_util::WINVERSION_VISTA) {
-    GetRootView()->SetLayoutManager(
-        new NonClientViewLayout(non_client_view_, this));
-  }
-
   ResetWindowRegion();
 }
 
 void CustomFrameWindow::SetClientView(ClientView* cv) {
   DCHECK(cv && !client_view() && GetHWND());
   set_client_view(cv);
   // For a CustomFrameWindow, the non-client view is the root.
   WidgetWin::SetContentsView(non_client_view_);
   // When the non client view is added to the view hierarchy, it will cause the
   // client view to be added as well.
@@ skipping 418 matching lines @@
   if ((GetKeyState(VK_CONTROL) & 0x80) == 0x80)
     message_flags |= MK_CONTROL;
   if ((GetKeyState(VK_SHIFT) & 0x80) == 0x80)
     message_flags |= MK_SHIFT;
   message_flags |= flags;
   ProcessMousePressed(temp, message_flags, false);
 }
 
 }  // namespace views