Changes workspace code to only move windows when the work area changes

ash/wm/workspace/workspace_manager2_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/workspace/workspace_manager2.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 835 matching lines @@
   EXPECT_TRUE(w2->IsVisible());
   EXPECT_EQ(1.0f, w2->layer()->GetCombinedOpacity());
   EXPECT_FALSE(w1->IsVisible());
 
   // Close |w2|.
   w2.reset();
   EXPECT_EQ(1.0f, w1->layer()->GetCombinedOpacity());
   EXPECT_TRUE(w1->IsVisible());
 }
 
+// Verifies windows that are offscreen don't move when switching workspaces.
+TEST_F(WorkspaceManager2Test, DontMoveOnSwitch) {
+  aura::test::EventGenerator generator(
+      Shell::GetPrimaryRootWindow(), gfx::Point());
+  generator.MoveMouseTo(0, 0);
+
+  scoped_ptr<Window> w1(CreateTestWindow());
+  const gfx::Rect w1_bounds(0, 1, 101, 102);
+  ShelfLayoutManager* shelf = Shell::GetInstance()->shelf();
+  const gfx::Rect touches_shelf_bounds(
+      0, shelf->GetIdealBounds().y() - 10, 101, 102);
+  // Move |w1| to overlap the shelf.
+  w1->SetBounds(touches_shelf_bounds);
+  w1->Show();
+  wm::ActivateWindow(w1.get());
+
+  // Create another window and maximize it.
+  scoped_ptr<Window> w2(CreateTestWindow());
+  w2->SetBounds(gfx::Rect(10, 11, 250, 251));
+  w2->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
+  w2->Show();
+  wm::ActivateWindow(w2.get());
+
+  // Switch to w1.
+  wm::ActivateWindow(w1.get());
+  EXPECT_EQ(touches_shelf_bounds.ToString(), w1->bounds().ToString());
+}
 }  // namespace internal
 }  // namespace ash