Enables docked windows by default

ash/wm/workspace_controller_unittest.cc

 // Copyright 2013 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_controller.h"
 
 #include <map>
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
@@ skipping 1214 matching lines @@
 
   // Activate the app.
   ash::wm::ActivateWindow(app.get());
   EXPECT_TRUE(wm::IsActiveWindow(app.get()));
   EXPECT_EQ(GetWindowNames(parent), GetLayerNames(parent));
 }
 
 namespace {
 
 // Used by DragMaximizedNonTrackedWindow to track how many times the window
-// hierarchy changes.
+// hierarchy changes affecting specified window.

[flackr, 2013/11/06 20:02:31]

nit:affecting the specified window.

[varkha, 2013/11/06 21:19:53]

Done.

 class DragMaximizedNonTrackedWindowObserver
     : public aura::WindowObserver {
  public:
-  DragMaximizedNonTrackedWindowObserver() : change_count_(0) {
+  DragMaximizedNonTrackedWindowObserver(aura::Window* window)
+  : change_count_(0),
+    window_(window) {
   }
 
   // Number of times OnWindowHierarchyChanged() has been received.
   void clear_change_count() { change_count_ = 0; }
   int change_count() const {
     return change_count_;
   }
 
   // aura::WindowObserver overrides:
   // Counts number of times a window is reparented. Ignores reparenting into and
   // from a docked container which is expected when a tab is dragged.
   virtual void OnWindowHierarchyChanged(
       const HierarchyChangeParams& params) OVERRIDE {
-    if ((params.old_parent->id() == kShellWindowId_DefaultContainer &&
+    if (params.target != window_ ||
+        (params.old_parent->id() == kShellWindowId_DefaultContainer &&
          params.new_parent->id() == kShellWindowId_DockedContainer) ||
         (params.old_parent->id() == kShellWindowId_DockedContainer &&
          params.new_parent->id() == kShellWindowId_DefaultContainer)) {
       return;
     }
     change_count_++;
   }
 
  private:
   int change_count_;
+  aura::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(DragMaximizedNonTrackedWindowObserver);
 };
 
 }  // namespace
 
 // Verifies setting tracked by workspace to false and then dragging a fullscreen
 // window doesn't result in changing the window hierarchy (which typically
 // indicates new workspaces have been created).
 TEST_F(WorkspaceControllerTest, DragFullscreenNonTrackedWindow) {
   aura::test::EventGenerator generator(
       Shell::GetPrimaryRootWindow(), gfx::Point());
   generator.MoveMouseTo(5, 5);
 
   aura::test::TestWindowDelegate delegate;
   delegate.set_window_component(HTCAPTION);
   scoped_ptr<Window> w1(
       aura::test::CreateTestWindowWithDelegate(&delegate,
                                                aura::client::WINDOW_TYPE_NORMAL,
                                                gfx::Rect(5, 6, 7, 8),
                                                NULL));
   ParentWindowInPrimaryRootWindow(w1.get());
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
   w1->Show();
   wm::ActivateWindow(w1.get());
-  DragMaximizedNonTrackedWindowObserver observer;
+  DragMaximizedNonTrackedWindowObserver observer(w1.get());
   w1->parent()->parent()->AddObserver(&observer);
   const gfx::Rect max_bounds(w1->bounds());
 
   generator.PressLeftButton();
   generator.MoveMouseTo(100, 100);
   // The bounds shouldn't change (drag should result in nothing happening
   // now.
   EXPECT_EQ(max_bounds.ToString(), w1->bounds().ToString());
 
   generator.ReleaseLeftButton();
@@ skipping 28 matching lines @@
   delegate.set_window_component(HTCAPTION);
   scoped_ptr<Window> w1(
       aura::test::CreateTestWindowWithDelegate(&delegate,
                                                aura::client::WINDOW_TYPE_NORMAL,
                                                gfx::Rect(5, 6, 7, 8),
                                                NULL));
   ParentWindowInPrimaryRootWindow(w1.get());
   w1->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   w1->Show();
   wm::ActivateWindow(w1.get());
-  DragMaximizedNonTrackedWindowObserver observer;
+  DragMaximizedNonTrackedWindowObserver observer(w1.get());
   w1->parent()->parent()->AddObserver(&observer);
   const gfx::Rect max_bounds(w1->bounds());
 
   generator.PressLeftButton();
   generator.MoveMouseTo(100, 100);
   // The bounds shouldn't change (drag should result in nothing happening
   // now.
   EXPECT_EQ(max_bounds.ToString(), w1->bounds().ToString());
 
   generator.ReleaseLeftButton();
@@ skipping 31 matching lines @@
   scoped_ptr<Window> maximized_window(CreateTestWindow());
   maximized_window->SetProperty(
       aura::client::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
   maximized_window->Show();
   wm::ActivateWindow(maximized_window.get());
   EXPECT_TRUE(maximized_window->IsVisible());
 }
 
 }  // namespace internal
 }  // namespace ash