Compact layout mananger animates windows rather than the default container layer.

ash/wm/compact_layout_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/wm/compact_layout_manager.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/aura_shell_test_base.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 109 matching lines @@
   EXPECT_TRUE(widget->IsVisible());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   EXPECT_FALSE(widget->IsVisible());
   window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL);
   EXPECT_TRUE(widget->IsVisible());
 }
 
 TEST_F(CompactLayoutManagerTest, TransitionTest) {
   // Assert on viewport size to be the host size.
   ASSERT_EQ(kMaxWidth, default_container_layer_width());
-  // Create 3 windows, check that the layer grow as each one is added
+  // Create 3 windows, check that the layer doesn't grow as each one is added
   // to the layout.
   aura::Window* window1 = CreateNormalWindow(0);
   EXPECT_EQ(kMaxWidth, default_container_layer_width());
   aura::Window* window2 = CreateNormalWindow(1);
-  EXPECT_EQ(kMaxWidth * 2, default_container_layer_width());
+  EXPECT_EQ(kMaxWidth, default_container_layer_width());
   aura::Window* window3 = CreateNormalWindow(2);
-  EXPECT_EQ(kMaxWidth * 3, default_container_layer_width());
+  EXPECT_EQ(kMaxWidth, default_container_layer_width());
   animation_element()->Step(base::TimeTicks::Now() +
                             base::TimeDelta::FromSeconds(1));
   RunAllPendingInMessageLoop();
 
   // Check laid out position of the windows.
-  EXPECT_EQ(0, window1->bounds().x());
-  EXPECT_EQ(kMaxWidth, window2->bounds().x());
-  EXPECT_EQ(kMaxWidth * 2, window3->bounds().x());
+  EXPECT_EQ(-kMaxWidth * 2, window1->bounds().x());
+  EXPECT_EQ(-kMaxWidth, window2->bounds().x());
+  EXPECT_EQ(0, window3->bounds().x());
 
   // Check layer transformation.
   ui::Transform target_transform;
-  target_transform.ConcatTranslate(-window3->bounds().x(), 0);
   EXPECT_EQ(target_transform, default_container_layer_transform());
   RunAllPendingInMessageLoop();
 
   // Check that only one window is visible.
   EXPECT_EQ(window3, layout_manager_->current_window_);
   EXPECT_FALSE(window1->IsVisible());
   EXPECT_FALSE(window2->IsVisible());
   EXPECT_TRUE(window3->IsVisible());
 
   // That window disappear, check that we transform the layer, and
   // again only have one window visible.
   window3->Hide();
   animation_element()->Step(base::TimeTicks::Now() +
                             base::TimeDelta::FromSeconds(1));
-  ui::Transform target_transform1;
-  target_transform1.ConcatTranslate(-window1->bounds().x(), 0);
-  EXPECT_EQ(target_transform1, default_container_layer_transform());
+
+  // Check laid out position of the windows.
+  EXPECT_EQ(0, window1->bounds().x());
+  EXPECT_EQ(kMaxWidth, window2->bounds().x());
+
   EXPECT_TRUE(window1->IsVisible());
   EXPECT_FALSE(window2->IsVisible());
   EXPECT_FALSE(window3->IsVisible());
   EXPECT_EQ(window1, layout_manager_->current_window_);
 }
 
 TEST_F(CompactLayoutManagerTest, SwitchToNextVisibleWindow) {
   // Create 3 windows
   aura::Window* window1 = CreateNormalWindow(0);
   window1->Hide();  // Hide window1 before its layer marked invisible.
@@ skipping 42 matching lines @@
   delete window1;
   delete window2;
   delete window3;
 
   // No current window now.
   EXPECT_EQ(NULL, layout_manager_->current_window_);
 }
 
 }  // namespace internal
 }  // namespace ash