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

Side by Side Diff: ash/display/display_controller_unittest.cc

Issue 10828133: Desktop Aura: Allow tab drags out of window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup Created 8 years, 4 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/display/multi_display_manager_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ash/display/display_controller.h" 5 #include "ash/display/display_controller.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/test/ash_test_base.h" 8 #include "ash/test/ash_test_base.h"
9 #include "ui/aura/display_manager.h" 9 #include "ui/aura/display_manager.h"
10 #include "ui/aura/env.h" 10 #include "ui/aura/env.h"
(...skipping 16 matching lines...) Expand all
27 } 27 }
28 28
29 } // namespace 29 } // namespace
30 30
31 typedef test::AshTestBase DisplayControllerTest; 31 typedef test::AshTestBase DisplayControllerTest;
32 32
33 #if defined(OS_WIN) 33 #if defined(OS_WIN)
34 // TOD(oshima): Windows creates a window with smaller client area. 34 // TOD(oshima): Windows creates a window with smaller client area.
35 // Fix this and enable tests. 35 // Fix this and enable tests.
36 #define MAYBE_SecondaryDisplayLayout DISABLED_SecondaryDisplayLayout 36 #define MAYBE_SecondaryDisplayLayout DISABLED_SecondaryDisplayLayout
37 #define MAYBE_BoundsUpdated DISABLED_BoundsUpdated
38 #else 37 #else
39 #define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout 38 #define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout
40 #define MAYBE_BoundsUpdated BoundsUpdated
41 #endif 39 #endif
42 40
43 TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) { 41 TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
44 UpdateDisplay("500x500,400x400"); 42 UpdateDisplay("500x500,400x400");
45 gfx::Display* secondary_display = 43 gfx::Display* secondary_display =
46 aura::Env::GetInstance()->display_manager()->GetDisplayAt(1); 44 aura::Env::GetInstance()->display_manager()->GetDisplayAt(1);
47 gfx::Insets insets(5, 5, 5, 5); 45 gfx::Insets insets(5, 5, 5, 5);
48 secondary_display->UpdateWorkAreaFromInsets(insets); 46 secondary_display->UpdateWorkAreaFromInsets(insets);
49 47
50 // Default layout is LEFT. 48 // Default layout is LEFT.
(...skipping 16 matching lines...) Expand all
67 EXPECT_EQ("-395,5 390x390", GetSecondaryDisplay().work_area().ToString()); 65 EXPECT_EQ("-395,5 390x390", GetSecondaryDisplay().work_area().ToString());
68 66
69 // Layout the secondary display to the top of the primary. 67 // Layout the secondary display to the top of the primary.
70 Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout( 68 Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
71 internal::DisplayController::TOP); 69 internal::DisplayController::TOP);
72 EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString()); 70 EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
73 EXPECT_EQ("0,-400 400x400", GetSecondaryDisplay().bounds().ToString()); 71 EXPECT_EQ("0,-400 400x400", GetSecondaryDisplay().bounds().ToString());
74 EXPECT_EQ("5,-395 390x390", GetSecondaryDisplay().work_area().ToString()); 72 EXPECT_EQ("5,-395 390x390", GetSecondaryDisplay().work_area().ToString());
75 } 73 }
76 74
77 TEST_F(DisplayControllerTest, MAYBE_BoundsUpdated) { 75 // TODO(oshima,erg): I suspect this test is now failing because I've changed
76 // the timing of the RootWindow::Show to be synchronous. If true, this test has
77 // always been incorrect, but is now visibly broken now that we're processing
78 // X11 configuration events while waiting for the MapNotify.
79 TEST_F(DisplayControllerTest, DISABLED_BoundsUpdated) {
78 Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout( 80 Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
79 internal::DisplayController::BOTTOM); 81 internal::DisplayController::BOTTOM);
80 UpdateDisplay("500x500,400x400"); 82 UpdateDisplay("500x500,400x400");
81 gfx::Display* secondary_display = 83 gfx::Display* secondary_display =
82 aura::Env::GetInstance()->display_manager()->GetDisplayAt(1); 84 aura::Env::GetInstance()->display_manager()->GetDisplayAt(1);
83 gfx::Insets insets(5, 5, 5, 5); 85 gfx::Insets insets(5, 5, 5, 5);
84 secondary_display->UpdateWorkAreaFromInsets(insets); 86 secondary_display->UpdateWorkAreaFromInsets(insets);
85 87
86 EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString()); 88 EXPECT_EQ("0,0 500x500", GetPrimaryDisplay().bounds().ToString());
87 EXPECT_EQ("0,500 400x400", GetSecondaryDisplay().bounds().ToString()); 89 EXPECT_EQ("0,500 400x400", GetSecondaryDisplay().bounds().ToString());
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 controller->set_dont_warp_mouse(false); 219 controller->set_dont_warp_mouse(false);
218 is_warped = controller->WarpMouseCursorIfNecessary(root_windows[0], 220 is_warped = controller->WarpMouseCursorIfNecessary(root_windows[0],
219 gfx::Point(499, 11)); 221 gfx::Point(499, 11));
220 EXPECT_TRUE(is_warped); 222 EXPECT_TRUE(is_warped);
221 EXPECT_EQ("501,11", 223 EXPECT_EQ("501,11",
222 aura::Env::GetInstance()->last_mouse_location().ToString()); 224 aura::Env::GetInstance()->last_mouse_location().ToString());
223 } 225 }
224 226
225 } // namespace test 227 } // namespace test
226 } // namespace ash 228 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/display/multi_display_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698