Reland Linux Window Control Alignment

ash/extended_desktop_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_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 500 matching lines @@
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("1000x600,600x400");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   views::Widget* w1 = CreateTestWidget(gfx::Rect(10, 10, 100, 100));
   views::Widget* w1_t1 = CreateTestWidgetWithParent(
       w1, gfx::Rect(50, 50, 50, 50), false /* transient */);
   // Transient child of the transient child.
   views::Widget* w1_t11 = CreateTestWidgetWithParent(
-      w1_t1, gfx::Rect(1200, 70, 30, 30), false /* transient */);
+      w1_t1, gfx::Rect(1200, 70, 35, 35), false /* transient */);
 
   views::Widget* w11 = CreateTestWidgetWithParent(
       w1, gfx::Rect(10, 10, 40, 40), true /* child */);
   views::Widget* w11_t1 = CreateTestWidgetWithParent(
       w1, gfx::Rect(1300, 100, 80, 80), false /* transient */);
 
   EXPECT_EQ(root_windows[0], w1->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[0], w11->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[0], w1_t1->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[0], w1_t11->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[0], w11_t1->GetNativeView()->GetRootWindow());
   EXPECT_EQ("50,50 50x50",
             w1_t1->GetWindowBoundsInScreen().ToString());
-  EXPECT_EQ("1200,70 30x30",
+  EXPECT_EQ("1200,70 35x35",
             w1_t11->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("20,20 40x40",
             w11->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("1300,100 80x80",
             w11_t1->GetWindowBoundsInScreen().ToString());
 
   w1->SetBounds(gfx::Rect(1100,10,100,100));
 
   EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[1], w1_t11->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[1], w11->GetNativeView()->GetRootWindow());
   EXPECT_EQ(root_windows[1], w11_t1->GetNativeView()->GetRootWindow());
 
   EXPECT_EQ("1110,20 40x40",
             w11->GetWindowBoundsInScreen().ToString());
   // Transient window's screen bounds stays the same.
   EXPECT_EQ("50,50 50x50",
             w1_t1->GetWindowBoundsInScreen().ToString());
-  EXPECT_EQ("1200,70 30x30",
+  EXPECT_EQ("1200,70 35x35",
             w1_t11->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("1300,100 80x80",
             w11_t1->GetWindowBoundsInScreen().ToString());
 
   // Transient window doesn't move between root window unless
   // its transient parent moves.
   w1_t1->SetBounds(gfx::Rect(10, 50, 50, 50));
   EXPECT_EQ(root_windows[1], w1_t1->GetNativeView()->GetRootWindow());
   EXPECT_EQ("10,50 50x50",
             w1_t1->GetWindowBoundsInScreen().ToString());
@@ skipping 231 matching lines @@
   generator.ReleaseLeftButton();
   EXPECT_EQ("-999,-999 -999,-999", event_handler.GetLocationsAndReset());
 
   generator.MoveMouseTo(400, 150);
   EXPECT_EQ("100,150 100,150", event_handler.GetLocationsAndReset());
 
   ash::Shell::GetInstance()->RemovePreTargetHandler(&event_handler);
 }
 
 }  // namespace ash