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

Unified Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 19460014: Do not create workspace for fullscreen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/wm/workspace/workspace.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager_unittest.cc
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index c778f08dc219b3f87d604f37e28ef3b2a5cbb271..0a82cebf24d99f0e9fecffb2c4be8f6ed3c4f84e 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -571,7 +571,10 @@ void ShelfLayoutManagerTest::RunGestureDragTests(gfx::Vector2d delta) {
EXPECT_EQ(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, shelf->auto_hide_behavior());
EXPECT_EQ(bounds_fullscreen.ToString(), window->bounds().ToString());
+ // Close actually, otherwise further event may be affected since widget
+ // is fullscreen status.
widget->Close();
+ RunAllPendingInMessageLoop();
}
// Fails on Mac only. Need to be implemented. http://crbug.com/111279.
@@ -1260,13 +1263,22 @@ TEST_F(ShelfLayoutManagerTest, MAYBE_SetAlignment) {
TEST_F(ShelfLayoutManagerTest, MAYBE_GestureDrag) {
ShelfLayoutManager* shelf = GetShelfLayoutManager();
- RunGestureDragTests(gfx::Vector2d(0, 100));
+ {
+ SCOPED_TRACE("BOTTOM");
+ RunGestureDragTests(gfx::Vector2d(0, 100));
+ }
- shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
- RunGestureDragTests(gfx::Vector2d(-100, 0));
+ {
+ SCOPED_TRACE("LEFT");
+ shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
+ RunGestureDragTests(gfx::Vector2d(-100, 0));
+ }
- shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
- RunGestureDragTests(gfx::Vector2d(100, 0));
+ {
+ SCOPED_TRACE("RIGHT");
+ shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
+ RunGestureDragTests(gfx::Vector2d(100, 0));
+ }
}
TEST_F(ShelfLayoutManagerTest, WindowVisibilityDisablesAutoHide) {
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/wm/workspace/workspace.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698