Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2216)

Unified Diff: ash/wm/drag_window_resizer_unittest.cc

Issue 657583003: Chrome OS: Ash support for >=3 displays. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again to resolve conflicts at TOT Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/drag_window_resizer.cc ('k') | ui/display/chromeos/display_configurator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/drag_window_resizer_unittest.cc
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
index 1d1288ae781503792f09c4e7601cdfc89134f5c8..7f507a01ed62c44195190ff0c426fc52b95e5710 100644
--- a/ash/wm/drag_window_resizer_unittest.cc
+++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -357,17 +357,18 @@ TEST_F(DragWindowResizerTest, DragWindowController) {
ASSERT_TRUE(resizer.get());
DragWindowResizer* drag_resizer = DragWindowResizer::instance_;
ASSERT_TRUE(drag_resizer);
- EXPECT_FALSE(drag_resizer->drag_window_controller_.get());
+ EXPECT_EQ(0u, drag_resizer->drag_window_controllers_.size());
// The pointer is inside the primary root. The drag window controller
// should be NULL.
resizer->Drag(CalculateDragPoint(*resizer, 10, 10), 0);
- EXPECT_FALSE(drag_resizer->drag_window_controller_.get());
+ EXPECT_EQ(0u, drag_resizer->drag_window_controllers_.size());
// The window spans both root windows.
resizer->Drag(CalculateDragPoint(*resizer, 798, 10), 0);
+ EXPECT_EQ(1u, drag_resizer->drag_window_controllers_.size());
DragWindowController* controller =
- drag_resizer->drag_window_controller_.get();
+ drag_resizer->drag_window_controllers_[0];
ASSERT_TRUE(controller);
ASSERT_TRUE(controller->drag_widget_);
@@ -387,7 +388,8 @@ TEST_F(DragWindowResizerTest, DragWindowController) {
// Enter the pointer to the secondary display.
resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
- controller = drag_resizer->drag_window_controller_.get();
+ EXPECT_EQ(1u, drag_resizer->drag_window_controllers_.size());
+ controller = drag_resizer->drag_window_controllers_[0];
ASSERT_TRUE(controller);
// |window_| should be transparent, and the drag window should be opaque.
EXPECT_GT(1.0f, window_->layer()->opacity());
@@ -409,7 +411,7 @@ TEST_F(DragWindowResizerTest, DragWindowController) {
ASSERT_TRUE(resizer.get());
DragWindowResizer* drag_resizer = DragWindowResizer::instance_;
ASSERT_TRUE(drag_resizer);
- EXPECT_FALSE(drag_resizer->drag_window_controller_.get());
+ EXPECT_EQ(0u, drag_resizer->drag_window_controllers_.size());
resizer->Drag(CalculateDragPoint(*resizer, 0, 610), 0);
resizer->RevertDrag();
« no previous file with comments | « ash/wm/drag_window_resizer.cc ('k') | ui/display/chromeos/display_configurator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698