| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 5 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
| 6 | 6 |
| 7 #include "ash/wm/property_util.h" | 7 #include "ash/wm/property_util.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1063 native_browser_list))); | 1063 native_browser_list))); |
| 1064 QuitWhenNotDragging(); | 1064 QuitWhenNotDragging(); |
| 1065 | 1065 |
| 1066 ASSERT_FALSE(TabDragController::IsActive()); | 1066 ASSERT_FALSE(TabDragController::IsActive()); |
| 1067 | 1067 |
| 1068 // Should be two browsers. | 1068 // Should be two browsers. |
| 1069 ASSERT_EQ(2u, native_browser_list->size()); | 1069 ASSERT_EQ(2u, native_browser_list->size()); |
| 1070 Browser* new_browser = native_browser_list->get(1); | 1070 Browser* new_browser = native_browser_list->get(1); |
| 1071 ASSERT_TRUE(new_browser->window()->IsActive()); | 1071 ASSERT_TRUE(new_browser->window()->IsActive()); |
| 1072 | 1072 |
| 1073 // Only the new browser should be visible. | 1073 EXPECT_TRUE(browser()->window()->GetNativeWindow()->IsVisible()); |
| 1074 EXPECT_FALSE(browser()->window()->GetNativeWindow()->IsVisible()); | |
| 1075 EXPECT_TRUE(new_browser->window()->GetNativeWindow()->IsVisible()); | 1074 EXPECT_TRUE(new_browser->window()->GetNativeWindow()->IsVisible()); |
| 1076 | 1075 |
| 1077 EXPECT_TRUE(GetTrackedByWorkspace(browser())); | 1076 EXPECT_TRUE(GetTrackedByWorkspace(browser())); |
| 1078 EXPECT_TRUE(GetTrackedByWorkspace(new_browser)); | 1077 EXPECT_TRUE(GetTrackedByWorkspace(new_browser)); |
| 1079 | 1078 |
| 1080 // Both windows should be maximized | 1079 // Both windows should be maximized |
| 1081 EXPECT_TRUE(browser()->window()->IsMaximized()); | 1080 EXPECT_TRUE(browser()->window()->IsMaximized()); |
| 1082 EXPECT_TRUE(new_browser->window()->IsMaximized()); | 1081 EXPECT_TRUE(new_browser->window()->IsMaximized()); |
| 1083 } | 1082 } |
| 1084 | 1083 |
| (...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1632 DifferentDeviceScaleFactorDisplayTabDragControllerTest, | 1631 DifferentDeviceScaleFactorDisplayTabDragControllerTest, |
| 1633 ::testing::Values("mouse")); | 1632 ::testing::Values("mouse")); |
| 1634 INSTANTIATE_TEST_CASE_P(TabDragging, | 1633 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 1635 DetachToBrowserTabDragControllerTest, | 1634 DetachToBrowserTabDragControllerTest, |
| 1636 ::testing::Values("mouse", "touch")); | 1635 ::testing::Values("mouse", "touch")); |
| 1637 #else | 1636 #else |
| 1638 INSTANTIATE_TEST_CASE_P(TabDragging, | 1637 INSTANTIATE_TEST_CASE_P(TabDragging, |
| 1639 DetachToBrowserTabDragControllerTest, | 1638 DetachToBrowserTabDragControllerTest, |
| 1640 ::testing::Values("mouse")); | 1639 ::testing::Values("mouse")); |
| 1641 #endif | 1640 #endif |
| OLD | NEW |