Merge 199451 "Removes the space for notification icon if it's no..."

ash/wm/panels/panel_window_resizer_unittest.cc

 // Copyright (c) 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/panels/panel_window_resizer.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 17 matching lines @@
 namespace ash {
 namespace internal {
 
 class PanelWindowResizerTest : public test::AshTestBase {
  public:
   PanelWindowResizerTest() {}
   virtual ~PanelWindowResizerTest() {}
 
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
+    UpdateDisplay("600x400");
     test::ShellTestApi test_api(Shell::GetInstance());
     model_ = test_api.launcher_model();
   }
 
   virtual void TearDown() OVERRIDE {
     AshTestBase::TearDown();
   }
 
  protected:
   gfx::Point CalculateDragPoint(const PanelWindowResizer& resizer,
@@ skipping 208 matching lines @@
 TEST_F(PanelWindowResizerTest, MAYBE_PanelDetachReattachMultipleDisplays) {
   UpdateDisplay("600x400,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
       CreatePanelWindow(gfx::Rect(600, 0, 201, 201)));
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   DetachReattachTest(window.get(), 0, -1);
 }
 
 TEST_F(PanelWindowResizerTest, MAYBE_DetachThenDragAcrossDisplays) {
-  UpdateDisplay("400x400,400x400");
+  UpdateDisplay("600x400,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
       CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   DragStart(window.get());
   DragMove(0, -100);
   DragEnd();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   EXPECT_EQ(initial_bounds.x(), window->GetBoundsInScreen().x());
   EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y());
   EXPECT_FALSE(window->GetProperty(kPanelAttachedKey));
   EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer,
             window->parent()->id());
 
   DragStart(window.get());
   DragMove(500, 0);
   DragEnd();
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
   EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y());
   EXPECT_FALSE(window->GetProperty(kPanelAttachedKey));
   EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer,
             window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, MAYBE_DetachAcrossDisplays) {
-  UpdateDisplay("400x400,400x400");
+  UpdateDisplay("600x400,600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
       CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   DragStart(window.get());
   DragMove(500, -100);
   DragEnd();
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
   EXPECT_EQ(initial_bounds.y() - 100, window->GetBoundsInScreen().y());
   EXPECT_FALSE(window->GetProperty(kPanelAttachedKey));
   EXPECT_EQ(internal::kShellWindowId_WorkspaceContainer,
             window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, MAYBE_DetachThenAttachToSecondDisplay) {
-  UpdateDisplay("400x400,400x600");
+  UpdateDisplay("600x400,600x600");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
       CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
 
   // Detach the window.
   DragStart(window.get());
   DragMove(0, -100);
   DragEnd();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
   EXPECT_FALSE(window->GetProperty(kPanelAttachedKey));
 
   // Drag the window just above the other display's launcher.
   DragStart(window.get());
   DragMove(500, 295);
   EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
 
   // Should stick to other launcher.
   EXPECT_EQ(initial_bounds.y() + 200, window->GetBoundsInScreen().y());
   DragEnd();
 
   // When dropped should move to second display's panel container.
   EXPECT_EQ(root_windows[1], window->GetRootWindow());
   EXPECT_TRUE(window->GetProperty(kPanelAttachedKey));
   EXPECT_EQ(internal::kShellWindowId_PanelContainer, window->parent()->id());
 }
 
 TEST_F(PanelWindowResizerTest, MAYBE_AttachToSecondDisplay) {
-  UpdateDisplay("400x400,400x600");
+  UpdateDisplay("600x400,600x600");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   scoped_ptr<aura::Window> window(
       CreatePanelWindow(gfx::Rect(0, 0, 201, 201)));
   gfx::Rect initial_bounds = window->GetBoundsInScreen();
   EXPECT_EQ(root_windows[0], window->GetRootWindow());
 
   // Drag the window just above the other display's launcher.
   DragStart(window.get());
   DragMove(500, 195);
   EXPECT_EQ(initial_bounds.x() + 500, window->GetBoundsInScreen().x());
@@ skipping 62 matching lines @@
 }
 
 TEST_F(PanelWindowResizerTest, DragReordersPanelsVertical) {
   ash::Shell* shell = ash::Shell::GetInstance();
   shell->SetShelfAlignment(SHELF_ALIGNMENT_LEFT, shell->GetPrimaryRootWindow());
   DragAlongShelfReorder(0, -1);
 }
 
 }  // namespace internal
 }  // namespace ash