Fixes two bugs related to constrained windows:

ui/views/widget/native_widget_aura_unittest.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 "ui/views/widget/native_widget_aura.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 63 matching lines @@
             window->GetNativeWindow()->bounds());
   widget->CloseNow();
 }
 
 TEST_F(NativeWidgetAuraTest, CenterWindowSmallParent) {
   // Make a parent window smaller than the host represented by rootwindow.
   scoped_ptr<aura::Window> parent(new aura::Window(NULL));
   parent->Init(ui::LAYER_NOT_DRAWN);
   parent->SetBounds(gfx::Rect(0, 0, 480, 320));
   scoped_ptr<Widget> widget(new Widget());
-  NativeWidgetAura* window  = Init(parent.get(), widget.get());
+  NativeWidgetAura* window = Init(parent.get(), widget.get());
 
   window->CenterWindow(gfx::Size(100, 100));
   EXPECT_EQ(gfx::Rect( (480 - 100) / 2,
                        (320 - 100) / 2,
                        100, 100),
             window->GetNativeWindow()->bounds());
   widget->CloseNow();
 }
 
+// Verifies CenterWindow() constrains to parent size.
+TEST_F(NativeWidgetAuraTest, CenterWindowSmallParentNotAtOrigin) {
+  // Make a parent window smaller than the host represented by rootwindow and
+  // offset it slightly from the origin.
+  scoped_ptr<aura::Window> parent(new aura::Window(NULL));
+  parent->Init(ui::LAYER_NOT_DRAWN);
+  parent->SetBounds(gfx::Rect(20, 40, 480, 320));
+  scoped_ptr<Widget> widget(new Widget());
+  NativeWidgetAura* window = Init(parent.get(), widget.get());
+  window->CenterWindow(gfx::Size(500, 600));
+
+  // |window| should be no bigger than |parent|.
+  EXPECT_EQ("20,40 480x320", window->GetNativeWindow()->bounds().ToString());
+  widget->CloseNow();
+}
+
 // Used by ShowMaximizedDoesntBounceAround. See it for details.
 class TestLayoutManager : public aura::LayoutManager {
  public:
   TestLayoutManager() {}
 
   virtual void OnWindowResized() OVERRIDE {
   }
   virtual void OnWindowAddedToLayout(aura::Window* child) OVERRIDE {
     // This simulates what happens when adding a maximized window.
     SetChildBoundsDirect(child, gfx::Rect(0, 0, 300, 300));
@@ skipping 246 matching lines @@
             parent->GetNativeWindow()->GetEventHandlerForPoint(
                 gfx::Point(20, 20)));
 
   // Work around for bug in NativeWidgetAura.
   // TODO: fix bug and remove this.
   parent->Close();
 }
 
 }  // namespace
 }  // namespace views