Allow storing display preferences per device.

ash/display/display_controller_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 "ash/display/display_controller.h"
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 namespace test {
 namespace {
 
 gfx::Display GetPrimaryDisplay() {
   return gfx::Screen::GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[0]);
 }
 
 gfx::Display GetSecondaryDisplay() {
   return gfx::Screen::GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[1]);
 }
 
+void SetSecondaryDisplayLayout(internal::DisplayLayout::Position position) {
+  internal::DisplayController* display_controller =
+      Shell::GetInstance()->display_controller();
+  internal::DisplayLayout layout = display_controller->default_display_layout();
+  layout.position = position;
+  display_controller->SetDefaultDisplayLayout(layout);
+}
+
 }  // namespace
 
 typedef test::AshTestBase DisplayControllerTest;
 
 #if defined(OS_WIN)
 // TOD(oshima): Windows creates a window with smaller client area.
 // Fix this and enable tests.
 #define MAYBE_SecondaryDisplayLayout DISABLED_SecondaryDisplayLayout
 #else
 #define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout
 #endif
 
 TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
   UpdateDisplay("500x500,400x400");
   gfx::Display* secondary_display =
       aura::Env::GetInstance()->display_manager()->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   // Default layout is LEFT.
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("500,0 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("505,5 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the bottom of the primary.
-  Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::BOTTOM);
+  SetSecondaryDisplayLayout(internal::DisplayLayout::BOTTOM);
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,500 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,505 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the left of the primary.
-  Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::LEFT);
+  SetSecondaryDisplayLayout(internal::DisplayLayout::LEFT);
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("-400,0 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("-395,5 390x390", GetSecondaryDisplay().work_area().ToString());
 
   // Layout the secondary display to the top of the primary.
-  Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::TOP);
+  SetSecondaryDisplayLayout(internal::DisplayLayout::TOP);
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,-400 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,-395 390x390", GetSecondaryDisplay().work_area().ToString());
 }
 
 // TODO(oshima,erg): I suspect this test is now failing because I've changed
 // the timing of the RootWindow::Show to be synchronous. If true, this test has
 // always been incorrect, but is now visibly broken now that we're processing
 // X11 configuration events while waiting for the MapNotify.
 TEST_F(DisplayControllerTest, DISABLED_BoundsUpdated) {
-  Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
-      internal::DisplayController::BOTTOM);
+  SetSecondaryDisplayLayout(internal::DisplayLayout::BOTTOM);
   UpdateDisplay("500x500,400x400");
   gfx::Display* secondary_display =
       aura::Env::GetInstance()->display_manager()->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,500 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,505 390x390", GetSecondaryDisplay().work_area().ToString());
 
@@ skipping 17 matching lines @@
   EXPECT_EQ("0,700 1000x1000", GetSecondaryDisplay().bounds().ToString());
 }
 
 // Verifies if the mouse pointer correctly moves to another display when there
 // are two displays.
 TEST_F(DisplayControllerTest, WarpMouse) {
   UpdateDisplay("500x500,500x500");
 
   ash::internal::DisplayController* controller =
       Shell::GetInstance()->display_controller();
-  EXPECT_EQ(internal::DisplayController::RIGHT,
-            controller->secondary_display_layout());
+  EXPECT_EQ(internal::DisplayLayout::RIGHT,
+            controller->default_display_layout().position);
 
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   bool is_warped = controller->WarpMouseCursorIfNecessary(root_windows[0],
                                                           gfx::Point(11, 11));
   EXPECT_FALSE(is_warped);
   is_warped = controller->WarpMouseCursorIfNecessary(root_windows[1],
                                                      gfx::Point(11, 11));
   EXPECT_FALSE(is_warped);
 
   // Touch the right edge of the primary root window. Pointer should warp.
@@ skipping 36 matching lines @@
   EXPECT_FALSE(is_warped);
 }
 
 // Verifies if the mouse pointer correctly moves to another display even when
 // two displays are not the same size.
 TEST_F(DisplayControllerTest, WarpMouseDifferentSizeDisplays) {
   UpdateDisplay("500x500,600x600");  // the second one is larger.
 
   ash::internal::DisplayController* controller =
       Shell::GetInstance()->display_controller();
-  EXPECT_EQ(internal::DisplayController::RIGHT,
-            controller->secondary_display_layout());
+  EXPECT_EQ(internal::DisplayLayout::RIGHT,
+            controller->default_display_layout().position);
 
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   aura::Env::GetInstance()->SetLastMouseLocation(*root_windows[1],
                                                  gfx::Point(123, 123));
 
   // Touch the left edge of the secondary root window. Pointer should NOT warp
   // because 1px left of (0, 500) is outside the primary root window.
   bool is_warped = controller->WarpMouseCursorIfNecessary(root_windows[1],
                                                           gfx::Point(0, 500));
   EXPECT_FALSE(is_warped);
@@ skipping 30 matching lines @@
   controller->set_dont_warp_mouse(false);
   is_warped = controller->WarpMouseCursorIfNecessary(root_windows[0],
                                                      gfx::Point(499, 11));
   EXPECT_TRUE(is_warped);
   EXPECT_EQ("501,11",
             aura::Env::GetInstance()->last_mouse_location().ToString());
 }
 
 }  // namespace test
 }  // namespace ash