[Aura] Fix HtmlDialogBrowserTest.SizeWindow.

views/widget/native_widget_aura.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/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/desktop_observer.h"
@@ skipping 115 matching lines @@
   window_->SetType(GetAuraWindowTypeForWidgetType(window_type));
   window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_NORMAL);
   window_->Init(params.create_texture_for_layer ?
                     ui::Layer::LAYER_HAS_TEXTURE :
                     ui::Layer::LAYER_HAS_NO_TEXTURE);
   if (window_type == Widget::InitParams::TYPE_CONTROL)
     window_->Show();
 
   window_->layer()->SetFillsBoundsOpaquely(!params.transparent);
   delegate_->OnNativeWidgetCreated();
-  window_->set_minimum_size(delegate_->GetMinimumSize());
   window_->SetBounds(params.bounds);
   if (window_type == Widget::InitParams::TYPE_CONTROL) {
     window_->SetParent(params.GetParent());
   } else {
     // Set up the transient child before the window is added. This way the
     // LayoutManager knows the window has a transient parent.
     gfx::NativeView parent = params.GetParent();
     if (parent)
       parent->AddTransientChild(window_);
     // SetAlwaysOnTop before SetParent so that always-on-top container is used.
@@ skipping 127 matching lines @@
 void NativeWidgetAura::CenterWindow(const gfx::Size& size) {
   const gfx::Rect parent_bounds = window_->parent()->bounds();
   window_->SetBounds(gfx::Rect((parent_bounds.width() - size.width())/2,
                                (parent_bounds.height() - size.height())/2,
                                size.width(),
                                size.height()));
 }
 
 void NativeWidgetAura::GetWindowPlacement(
     gfx::Rect* bounds,
-    ui::WindowShowState* maximized) const {
-  *maximized = static_cast<ui::WindowShowState>(
+    ui::WindowShowState* show_state) const {
+  *bounds = window_->GetTargetBounds();
+  *show_state = static_cast<ui::WindowShowState>(
       window_->GetIntProperty(aura::kShowStateKey));
 }
 
 void NativeWidgetAura::SetWindowTitle(const string16& title) {
   window_->set_title(title);
 }
 
 void NativeWidgetAura::SetWindowIcons(const SkBitmap& window_icon,
                                      const SkBitmap& app_icon) {
   // Aura doesn't have window icons.
@@ skipping 224 matching lines @@
 void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) {
   if (delegate_->OnKeyEvent(key))
     return;
   if (key.type() == ui::ET_KEY_PRESSED && GetWidget()->GetFocusManager())
     GetWidget()->GetFocusManager()->OnKeyEvent(key);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, aura::WindowDelegate implementation:
 
+void NativeWidgetAura::OnBoundsChanging(gfx::Rect* new_bounds) {
+  // Enforces a minimum size.
+  const gfx::Size& min_size = delegate_->GetMinimumSize();
+  new_bounds->set_width(std::max(min_size.width(), new_bounds->width()));
+  new_bounds->set_height(std::max(min_size.height(), new_bounds->height()));
+}
+
 void NativeWidgetAura::OnBoundsChanged(const gfx::Rect& old_bounds,
                                        const gfx::Rect& new_bounds) {
   if (old_bounds.origin() != new_bounds.origin())
     GetWidget()->widget_delegate()->OnWidgetMove();
   if (old_bounds.size() != new_bounds.size())
     delegate_->OnNativeWidgetSizeChanged(new_bounds.size());
 }
 
 void NativeWidgetAura::OnFocus() {
   Widget* widget = GetWidget();
@@ skipping 189 matching lines @@
   NOTIMPLEMENTED();
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
   return aura::Desktop::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views