Enable Virtual Screen Coordinates

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/root_window.h"
 #include "ui/gfx/display.h"
@@ skipping 18 matching lines @@
 
 }  // namespace
 
 class DisplayControllerTest : public test::AshTestBase {
  public:
   DisplayControllerTest() {}
   virtual ~DisplayControllerTest() {}
 
   virtual void SetUp() OVERRIDE {
     internal::DisplayController::SetExtendedDesktopEnabled(true);
-    internal::DisplayController::SetVirtualScreenCoordinatesEnabled(true);
     AshTestBase::SetUp();
   }
 
   virtual void TearDown() OVERRIDE {
     AshTestBase::TearDown();
     internal::DisplayController::SetExtendedDesktopEnabled(false);
-    internal::DisplayController::SetVirtualScreenCoordinatesEnabled(false);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(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
 #define MAYBE_BoundsUpdated DISABLED_BoundsUpdated
 #else
 #define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout
 #define MAYBE_BoundsUpdated BoundsUpdated
 #endif
 
 TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
-  UpdateDisplay("0+0-500x500,0+0-400x400");
+  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());
 
@@ skipping 15 matching lines @@
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
       internal::DisplayController::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());
 }
 
 TEST_F(DisplayControllerTest, MAYBE_BoundsUpdated) {
   Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
       internal::DisplayController::BOTTOM);
-  UpdateDisplay("0+0-500x500,0+0-400x400");
+  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());
 
-  UpdateDisplay("0+0-600x600,0+0-400x400");
+  UpdateDisplay("600x600,400x400");
   EXPECT_EQ("0,0 600x600", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,600 400x400", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,605 390x390", GetSecondaryDisplay().work_area().ToString());
 
-  UpdateDisplay("0+0-600x600,0+0-500x500");
+  UpdateDisplay("600x600,500x500");
   EXPECT_EQ("0,0 600x600", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,600 500x500", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,605 490x490", GetSecondaryDisplay().work_area().ToString());
 
-  UpdateDisplay("0+0-600x600");
+  UpdateDisplay("600x600");
   EXPECT_EQ("0,0 600x600", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ(1, gfx::Screen::GetNumDisplays());
 
-  UpdateDisplay("0+0-700x700,0+0-1000x1000");
+  UpdateDisplay("700x700,1000x1000");
   ASSERT_EQ(2, gfx::Screen::GetNumDisplays());
   EXPECT_EQ("0,0 700x700", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,700 1000x1000", GetSecondaryDisplay().bounds().ToString());
 }
 
 }  // namespace test
 }  // namespace ash