Restore bounds after the screen is restored in clamshell

ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

 // Copyright 2014 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 "ash/wm/maximize_mode/maximize_mode_controller.h"
 
 #include <math.h>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_switches.h"
+#include "ash/display/screen_orientation_controller_chromeos.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "base/test/user_action_tester.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/accelerometer/accelerometer_types.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/fake_power_manager_client.h"
 #include "ui/display/manager/display_manager.h"
+#include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/vector3d_f.h"
 #include "ui/message_center/message_center.h"
 
 #if defined(USE_X11)
 #include "ui/events/test/events_test_utils_x11.h"
 #endif
 
@@ skipping 602 matching lines @@
 
   OpenLidToAngle(30.0f);
   EXPECT_TRUE(IsMaximizeModeStarted());
   EXPECT_TRUE(AreEventsBlocked());
 
   SetTabletMode(false);
   EXPECT_TRUE(IsMaximizeModeStarted());
   EXPECT_TRUE(AreEventsBlocked());
 }
 
+TEST_F(MaximizeModeControllerTest, RestoreAfterExit) {
+  UpdateDisplay("1000x600");
+  std::unique_ptr<aura::Window> w1(
+      CreateTestWindowInShellWithBounds(gfx::Rect(10, 10, 900, 300)));
+  maximize_mode_controller()->EnableMaximizeModeWindowManager(true);
+  Shell::Get()->screen_orientation_controller()->SetLockToRotation(
+      display::Display::ROTATE_90);
+  display::Display display = display::Screen::GetScreen()->GetPrimaryDisplay();
+  EXPECT_EQ(display::Display::ROTATE_90, display.rotation());
+  EXPECT_LT(display.size().width(), display.size().height());
+  maximize_mode_controller()->EnableMaximizeModeWindowManager(false);
+  display = display::Screen::GetScreen()->GetPrimaryDisplay();
+  // Sanity checks.
+  EXPECT_EQ(display::Display::ROTATE_0, display.rotation());
+  EXPECT_GT(display.size().width(), display.size().height());
+
+  // The bounds should be restored to the original bounds, and
+  // should not be clamped by the portrait display in touch view.
+  EXPECT_EQ(gfx::Rect(10, 10, 900, 300), w1->bounds());
+}
+
 }  // namespace ash