Save display preference when all display configuration changes has been completed.

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/display/display_info.h"
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/base/events/event_handler.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 namespace {
 
 class TestObserver : public DisplayController::Observer {
  public:
-  TestObserver() : count_(0) {
+  TestObserver() : changing_count_(0), changed_count_(0) {
     Shell::GetInstance()->display_controller()->AddObserver(this);
   }
 
   virtual ~TestObserver() {
     Shell::GetInstance()->display_controller()->RemoveObserver(this);
   }
 
   virtual void OnDisplayConfigurationChanging() OVERRIDE {
-    ++count_;
+    ++changing_count_;
+  }
+
+  virtual void OnDisplayConfigurationChanged() OVERRIDE {
+    ++changed_count_;
   }
 
   int CountAndReset() {
-    int c = count_;
-    count_ = 0;
+    EXPECT_EQ(changing_count_, changed_count_);
+    int c = changing_count_;
+    changing_count_ = changed_count_ = 0;
     return c;
   }
 
  private:
-  int count_;
+  int changing_count_;
+  int changed_count_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 gfx::Display GetPrimaryDisplay() {
   return Shell::GetScreen()->GetDisplayNearestWindow(
       Shell::GetAllRootWindows()[0]);
 }
 
 gfx::Display GetSecondaryDisplay() {
@@ skipping 60 matching lines @@
 
 typedef test::AshTestBase DisplayControllerTest;
 
 TEST_F(DisplayControllerShutdownTest, Shutdown) {
   UpdateDisplay("444x333, 200x200");
 }
 
 TEST_F(DisplayControllerTest, SecondaryDisplayLayout) {
   TestObserver observer;
   UpdateDisplay("500x500,400x400");
-  EXPECT_EQ(2, observer.CountAndReset());  // resize and add
+  EXPECT_EQ(1, observer.CountAndReset());  // resize and add
   gfx::Display* secondary_display =
       Shell::GetInstance()->display_manager()->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   // Default layout is RIGHT.
   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 50 matching lines @@
   SetSecondaryDisplayLayoutAndOffset(DisplayLayout::BOTTOM, -400);
   EXPECT_EQ(1, observer.CountAndReset());  // resize and add
   EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("-300,500 400x400", GetSecondaryDisplay().bounds().ToString());
 }
 
 TEST_F(DisplayControllerTest, BoundsUpdated) {
   TestObserver observer;
   SetSecondaryDisplayLayout(DisplayLayout::BOTTOM);
   UpdateDisplay("200x200,300x300");  // layout, resize and add.
-  EXPECT_EQ(3, observer.CountAndReset());
+  EXPECT_EQ(2, observer.CountAndReset());
 
-  gfx::Display* secondary_display =
-      Shell::GetInstance()->display_manager()->GetDisplayAt(1);
+  internal::DisplayManager* display_manager =
+      Shell::GetInstance()->display_manager();
+  gfx::Display* secondary_display = display_manager->GetDisplayAt(1);
   gfx::Insets insets(5, 5, 5, 5);
   secondary_display->UpdateWorkAreaFromInsets(insets);
 
   EXPECT_EQ("0,0 200x200", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,200 300x300", GetSecondaryDisplay().bounds().ToString());
   EXPECT_EQ("5,205 290x290", GetSecondaryDisplay().work_area().ToString());
 
   UpdateDisplay("400x400,200x200");
-  EXPECT_EQ(2, observer.CountAndReset());  // two resizes
+  EXPECT_EQ(1, observer.CountAndReset());  // two resizes
   EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,400 200x200", GetSecondaryDisplay().bounds().ToString());
   if (!ash::Shell::IsLauncherPerDisplayEnabled())
     EXPECT_EQ("5,405 190x190", GetSecondaryDisplay().work_area().ToString());
 
   UpdateDisplay("400x400,300x300");
   EXPECT_EQ(1, observer.CountAndReset());
   EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ("0,400 300x300", GetSecondaryDisplay().bounds().ToString());
   if (!ash::Shell::IsLauncherPerDisplayEnabled())
     EXPECT_EQ("5,405 290x290", GetSecondaryDisplay().work_area().ToString());
 
   UpdateDisplay("400x400");
   EXPECT_EQ(1, observer.CountAndReset());
   EXPECT_EQ("0,0 400x400", GetPrimaryDisplay().bounds().ToString());
   EXPECT_EQ(1, Shell::GetScreen()->GetNumDisplays());
 
-  UpdateDisplay("500x500,700x700");
-  EXPECT_EQ(2, observer.CountAndReset());
+  UpdateDisplay("400x500,700x700*2");
+  EXPECT_EQ(1, observer.CountAndReset());
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
-  EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
-  EXPECT_EQ("0,500 700x700", GetSecondaryDisplay().bounds().ToString());
+  EXPECT_EQ("0,0 400x500", GetPrimaryDisplay().bounds().ToString());
+  EXPECT_EQ("0,500 350x350", GetSecondaryDisplay().bounds().ToString());
+
+  // No change
+  UpdateDisplay("400x500,700x700*2");
+  EXPECT_EQ(0, observer.CountAndReset());
+
+  // Rotation
+  int64 primary_id = GetPrimaryDisplay().id();
+  display_manager->SetDisplayRotation(primary_id, gfx::Display::ROTATE_90);
+  EXPECT_EQ(1, observer.CountAndReset());
+  display_manager->SetDisplayRotation(primary_id, gfx::Display::ROTATE_90);
+  EXPECT_EQ(0, observer.CountAndReset());
+
+  // UI scale
+  int64 secondary_id = GetSecondaryDisplay().id();
+  gfx::Display::SetInternalDisplayId(secondary_id);
+  display_manager->SetDisplayUIScale(secondary_id, 1.25f);
+  EXPECT_EQ(1, observer.CountAndReset());
+  display_manager->SetDisplayUIScale(secondary_id, 1.25f);
+  EXPECT_EQ(0, observer.CountAndReset());
 }
 
 TEST_F(DisplayControllerTest, InvertLayout) {
   EXPECT_EQ("left, 0",
             DisplayLayout(DisplayLayout::RIGHT, 0).Invert().ToString());
   EXPECT_EQ("left, -100",
             DisplayLayout(DisplayLayout::RIGHT, 100).Invert().ToString());
   EXPECT_EQ("left, 50",
             DisplayLayout(DisplayLayout::RIGHT, -50).Invert().ToString());
 
@@ skipping 454 matching lines @@
 
   aura::test::EventGenerator generator(root_windows[0]);
   generator.MoveMouseTo(599, 200);
   EXPECT_EQ("449,150", event_handler.GetLocationAndReset());
 
   Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace test
 }  // namespace ash