Enable Virtual Screen Coordinates

ash/display/multi_display_manager_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/multi_display_manager.h"
 
+#include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/format_macros.h"
 #include "base/stringprintf.h"
 #include "ui/aura/display_observer.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/gfx/display.h"
 
 namespace ash {
 namespace test {
 
 using std::vector;
 using std::string;
 
 class MultiDisplayManagerTest : public test::AshTestBase,
                                 public aura::DisplayObserver,
                                 public aura::WindowObserver {
  public:
   MultiDisplayManagerTest()
       : removed_count_(0U),
         root_window_destroyed_(false) {
   }
   virtual ~MultiDisplayManagerTest() {}
 
   virtual void SetUp() OVERRIDE {
+    internal::DisplayController::SetExtendedDesktopEnabled(true);
     AshTestBase::SetUp();
     display_manager()->AddObserver(this);
     Shell::GetPrimaryRootWindow()->AddObserver(this);
   }
   virtual void TearDown() OVERRIDE {
     Shell::GetPrimaryRootWindow()->RemoveObserver(this);
     display_manager()->RemoveObserver(this);
     AshTestBase::TearDown();
+    internal::DisplayController::SetExtendedDesktopEnabled(false);
   }
 
   aura::DisplayManager* display_manager() {
     return aura::Env::GetInstance()->display_manager();
   }
   const vector<gfx::Display>& changed() const { return changed_; }
   const vector<gfx::Display>& added() const { return added_; }
 
   string GetCountSummary() const {
     return StringPrintf("%"PRIuS" %"PRIuS" %"PRIuS,
@@ skipping 53 matching lines @@
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
 
   // Update primary and add seconary.
   LOG(ERROR) << "A";
   UpdateDisplay("0+0-500x500,0+501-400x400");
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_EQ("1 1 0", GetCountSummary());
   EXPECT_EQ(display_manager()->GetDisplayAt(0)->id(), changed()[0].id());
   EXPECT_EQ(display_manager()->GetDisplayAt(1)->id(), added()[0].id());
   EXPECT_EQ("0,0 500x500", changed()[0].bounds().ToString());
-  EXPECT_EQ("0,0 400x400", added()[0].bounds().ToString());
+  // Secondary display is on right.
+  EXPECT_EQ("500,0 400x400", added()[0].bounds().ToString());
   EXPECT_EQ("0,501 400x400", added()[0].bounds_in_pixel().ToString());
   reset();
 
   LOG(ERROR) << "B";
   // Delete secondary.
   UpdateDisplay("0+0-500x500");
   EXPECT_EQ("0 0 1", GetCountSummary());
   reset();
 
   // Change primary.
   UpdateDisplay("0+0-1000x600");
   EXPECT_EQ("1 0 0", GetCountSummary());
   EXPECT_EQ(display_manager()->GetDisplayAt(0)->id(), changed()[0].id());
   EXPECT_EQ("0,0 1000x600", changed()[0].bounds().ToString());
   reset();
 
   // Add secondary.
   UpdateDisplay("0+0-1000x600,1001+0-600x400");
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0 1 0", GetCountSummary());
   EXPECT_EQ(display_manager()->GetDisplayAt(1)->id(), added()[0].id());
-  EXPECT_EQ("0,0 600x400", added()[0].bounds().ToString());
+  // Secondary display is on right.
+  EXPECT_EQ("1000,0 600x400", added()[0].bounds().ToString());
   EXPECT_EQ("1001,0 600x400", added()[0].bounds_in_pixel().ToString());
   reset();
 
   // Secondary removed, primary changed.
   UpdateDisplay("0+0-800x300");
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ("1 0 1", GetCountSummary());
   EXPECT_EQ(display_manager()->GetDisplayAt(0)->id(), changed()[0].id());
   EXPECT_EQ("0,0 800x300", changed()[0].bounds().ToString());
   reset();
@@ skipping 18 matching lines @@
   EXPECT_EQ("100,100 500x400", changed()[0].bounds_in_pixel().ToString());
   reset();
 
   // Go back to zero and wake up with multiple displays.
   display_manager()->OnNativeDisplaysChanged(empty);
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_FALSE(root_window_destroyed());
   reset();
 
   // Add secondary.
-  UpdateDisplay("0+0-1000x600,1000+0-600x400");
+  UpdateDisplay("0+0-1000x600,1000+1000-600x400");
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0,0 1000x600",
             display_manager()->GetDisplayAt(0)->bounds().ToString());
-  EXPECT_EQ("0,0 600x400",
+  // Secondary display is on right.
+  EXPECT_EQ("1000,0 600x400",
             display_manager()->GetDisplayAt(1)->bounds().ToString());
-  EXPECT_EQ("1000,0 600x400",
+  EXPECT_EQ("1000,1000 600x400",
             display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
   reset();
 
   aura::DisplayManager::set_use_fullscreen_host_window(false);
 }
 
 // Test in emulation mode (use_fullscreen_host_window=false)
 TEST_F(MultiDisplayManagerTest, MAYBE_EmulatorTest) {
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
 
@@ skipping 30 matching lines @@
 
 // TODO(oshima): Device scale factor is supported on chromeos only for now.
 #if defined(OS_CHROMEOS)
 #define MAYBE_TestDeviceScaleOnlyChange TestDeviceScaleOnlyChange
 #else
 #define MAYBE_TestDeviceScaleOnlyChange DISABLED_TestDeviceScaleOnlyChange
 #endif
 
 TEST_F(MultiDisplayManagerTest, MAYBE_TestDeviceScaleOnlyChange) {
   aura::DisplayManager::set_use_fullscreen_host_window(true);
-  UpdateDisplay("0+0-1000x600");
+  UpdateDisplay("1000x600");
   EXPECT_EQ(1,
             Shell::GetPrimaryRootWindow()->compositor()->device_scale_factor());
   EXPECT_EQ("1000x600",
             Shell::GetPrimaryRootWindow()->bounds().size().ToString());
-  UpdateDisplay("0+0-1000x600*2");
+  UpdateDisplay("1000x600*2");
   EXPECT_EQ(2,
             Shell::GetPrimaryRootWindow()->compositor()->device_scale_factor());
   EXPECT_EQ("500x300",
             Shell::GetPrimaryRootWindow()->bounds().size().ToString());
   aura::DisplayManager::set_use_fullscreen_host_window(false);
 }
 
 }  // namespace test
 }  // namespace ash