Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ash / wm / toplevel_window_event_handler_unittest.cc

diff --git a/src/ash/wm/toplevel_window_event_handler_unittest.cc b/src/ash/wm/toplevel_window_event_handler_unittest.cc
index 91a6215..2a1ce8c 100644 (file)
--- a/src/ash/wm/toplevel_window_event_handler_unittest.cc
+++ b/src/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -27,6 +27,7 @@
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 #include "ui/gfx/screen.h"
+#include "ui/views/corewm/window_util.h"
 
 #if defined(OS_WIN)
 // Windows headers define macros for these function names which screw with us.
@@ -352,6 +353,25 @@ TEST_F(ToplevelWindowEventHandlerTest, BottomWorkArea) {
       target->bounds().size().ToString());
 }
 
+TEST_F(ToplevelWindowEventHandlerTest, DontDragIfModalChild) {
+  scoped_ptr<aura::Window> w1(CreateWindow(HTCAPTION));
+  scoped_ptr<aura::Window> w2(CreateWindow(HTCAPTION));
+  w2->SetBounds(gfx::Rect(100, 0, 100, 100));
+  w2->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
+  views::corewm::AddTransientChild(w1.get(), w2.get());
+  gfx::Size size = w1->bounds().size();
+
+  // Attempt to drag w1, position and size should not change because w1 has a
+  // modal child.
+  DragFromCenterBy(w1.get(), 100, 100);
+  EXPECT_EQ("0,0", w1->bounds().origin().ToString());
+  EXPECT_EQ(size.ToString(), w1->bounds().size().ToString());
+
+  TouchDragFromCenterBy(w1.get(), 100, 100);
+  EXPECT_EQ("0,0", w1->bounds().origin().ToString());
+  EXPECT_EQ(size.ToString(), w1->bounds().size().ToString());
+}
+
 // Verifies we don't let windows drag to a -y location.
 TEST_F(ToplevelWindowEventHandlerTest, DontDragToNegativeY) {
   scoped_ptr<aura::Window> target(CreateWindow(HTTOP));
@@ -459,7 +479,7 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDrag) {
   RunAllPendingInMessageLoop();
   EXPECT_NE(old_bounds.ToString(), target->bounds().ToString());
   EXPECT_TRUE(window_state->IsMinimized());
-  EXPECT_TRUE(window_state->always_restores_to_restore_bounds());
+  EXPECT_TRUE(window_state->unminimize_to_restore_bounds());
   EXPECT_EQ(old_bounds.ToString(),
             window_state->GetRestoreBoundsInScreen().ToString());
 }
@@ -513,7 +533,7 @@ TEST_F(ToplevelWindowEventHandlerTest, GestureDragToRestore) {
   RunAllPendingInMessageLoop();
   EXPECT_NE(old_bounds.ToString(), window->bounds().ToString());
   EXPECT_TRUE(window_state->IsMinimized());
-  EXPECT_TRUE(window_state->always_restores_to_restore_bounds());
+  EXPECT_TRUE(window_state->unminimize_to_restore_bounds());
   EXPECT_EQ(old_bounds.ToString(),
             window_state->GetRestoreBoundsInScreen().ToString());
 }
@@ -704,7 +724,7 @@ TEST_F(ToplevelWindowEventHandlerTest, RunMoveLoopFailsDuringInProgressDrag) {
   window1->Focus();
   generator.PressLeftButton();
   generator.MoveMouseBy(10, 11);
-  RunAllPendingInMessageLoop();
+  EXPECT_EQ("10,11 100x100", window1->bounds().ToString());
 
   aura::client::WindowMoveClient* move_client =
       aura::client::GetWindowMoveClient(window2->GetRootWindow());
@@ -713,7 +733,6 @@ TEST_F(ToplevelWindowEventHandlerTest, RunMoveLoopFailsDuringInProgressDrag) {
                 aura::client::WINDOW_MOVE_SOURCE_MOUSE));
 
   generator.ReleaseLeftButton();
-  RunAllPendingInMessageLoop();
   EXPECT_EQ("10,11 100x100", window1->bounds().ToString());
 }