Fix right edge bounds for panel position.

ash/wm/panel_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/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_button.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/launcher/launcher_view.h"
+#include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/launcher_view_test_api.h"
 #include "ash/test/shell_test_api.h"
 #include "ash/test/test_launcher_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 50 matching lines @@
   }
 
   void GetCalloutWidget(views::Widget** widget) {
     PanelLayoutManager* manager =
         static_cast<PanelLayoutManager*>(GetPanelContainer()->layout_manager());
     ASSERT_TRUE(manager);
     ASSERT_TRUE(manager->callout_widget());
     *widget = manager->callout_widget();
   }
 
+  void PanelInScreen(aura::Window* panel) {
+    gfx::Rect panel_bounds = panel->GetBoundsInRootWindow();
+    gfx::Point root_point = gfx::Point(panel_bounds.x(), panel_bounds.y());
+    gfx::Display display = ScreenAsh::FindDisplayContainingPoint(root_point);
+
+    gfx::Rect panel_bounds_in_screen = panel->GetBoundsInScreen();
+    gfx::Point screen_bottom_right = gfx::Point(
+        panel_bounds_in_screen.right(),
+        panel_bounds_in_screen.bottom());
+    gfx::Rect display_bounds = display.bounds();
+    EXPECT_TRUE(screen_bottom_right.x() < display_bounds.width() &&
+                screen_bottom_right.y() < display_bounds.height());
+  }
+
   void PanelsNotOverlapping(aura::Window* panel1, aura::Window* panel2) {
     // Waits until all launcher view animations are done.
     launcher_view_test()->RunMessageLoopUntilAnimationsDone();
     gfx::Rect window1_bounds = panel1->GetBoundsInRootWindow();
     gfx::Rect window2_bounds = panel2->GetBoundsInRootWindow();
 
     EXPECT_FALSE(window1_bounds.Intersects(window2_bounds));
   }
 
   // TODO(dcheng): This should be const, but GetScreenBoundsOfItemIconForWindow
@@ skipping 212 matching lines @@
 }
 
 TEST_F(PanelLayoutManagerTest, SplitView) {
   gfx::Rect bounds(0, 0, 90, 201);
   scoped_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   scoped_ptr<aura::Window> w2(CreatePanelWindow(bounds));
 
   EXPECT_NO_FATAL_FAILURE(PanelsNotOverlapping(w1.get(), w2.get()));
 }
 
+TEST_F(PanelLayoutManagerTest, SplitViewOverlapWhenLarge) {
+  gfx::Rect bounds(0, 0, 600, 201);
+  scoped_ptr<aura::Window> w1(CreatePanelWindow(bounds));
+  scoped_ptr<aura::Window> w2(CreatePanelWindow(bounds));
+
+  EXPECT_NO_FATAL_FAILURE(PanelInScreen(w1.get()));
+  EXPECT_NO_FATAL_FAILURE(PanelInScreen(w2.get()));
+}
+
 TEST_F(PanelLayoutManagerTest, FanWindows) {
   gfx::Rect bounds(0, 0, 201, 201);
   scoped_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   scoped_ptr<aura::Window> w2(CreatePanelWindow(bounds));
   scoped_ptr<aura::Window> w3(CreatePanelWindow(bounds));
 
   launcher_view_test()->RunMessageLoopUntilAnimationsDone();
   int window_x1 = w1->GetBoundsInRootWindow().x();
   int window_x2 = w2->GetBoundsInRootWindow().x();
   int window_x3 = w3->GetBoundsInRootWindow().x();
@@ skipping 89 matching lines @@
   EXPECT_EQ(root_windows[1], p1_d1->GetRootWindow());
   EXPECT_EQ(root_windows[0], p2_d1->GetRootWindow());
   EXPECT_EQ(root_windows[0], p1_d2->GetRootWindow());
   EXPECT_EQ(root_windows[1], p2_d2->GetRootWindow());
   EXPECT_TRUE(root_windows[0]->GetBoundsInScreen().Contains(
       p1_d2->GetBoundsInScreen()));
 }
 
 }  // namespace internal
 }  // namespace ash