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

Side by Side Diff: ash/shelf/shelf_layout_manager_unittest.cc

Issue 16539005: Skip mulitple-dispay tests on win8 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase again, and comment Created 7 years, 6 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
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/shelf/shelf_layout_manager.h" 5 #include "ash/shelf/shelf_layout_manager.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/accelerators/accelerator_table.h" 8 #include "ash/accelerators/accelerator_table.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 1190 matching lines...) Expand 10 before | Expand all | Expand 10 after
1201 RunGestureDragTests(gfx::Vector2d(0, 100)); 1201 RunGestureDragTests(gfx::Vector2d(0, 100));
1202 1202
1203 shelf->SetAlignment(SHELF_ALIGNMENT_LEFT); 1203 shelf->SetAlignment(SHELF_ALIGNMENT_LEFT);
1204 RunGestureDragTests(gfx::Vector2d(-100, 0)); 1204 RunGestureDragTests(gfx::Vector2d(-100, 0));
1205 1205
1206 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT); 1206 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
1207 RunGestureDragTests(gfx::Vector2d(100, 0)); 1207 RunGestureDragTests(gfx::Vector2d(100, 0));
1208 } 1208 }
1209 1209
1210 TEST_F(ShelfLayoutManagerTest, WindowVisibilityDisablesAutoHide) { 1210 TEST_F(ShelfLayoutManagerTest, WindowVisibilityDisablesAutoHide) {
1211 RETURN_IF_WIN8;
1212
1211 UpdateDisplay("800x600,800x600"); 1213 UpdateDisplay("800x600,800x600");
1212 ShelfLayoutManager* shelf = GetShelfLayoutManager(); 1214 ShelfLayoutManager* shelf = GetShelfLayoutManager();
1213 shelf->LayoutShelf(); 1215 shelf->LayoutShelf();
1214 shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS); 1216 shelf->SetAutoHideBehavior(SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS);
1215 1217
1216 // Create a visible window so auto-hide behavior is enforced 1218 // Create a visible window so auto-hide behavior is enforced
1217 views::Widget* dummy = CreateTestWidget(); 1219 views::Widget* dummy = CreateTestWidget();
1218 1220
1219 // Window visible => auto hide behaves normally. 1221 // Window visible => auto hide behaves normally.
1220 shelf->UpdateVisibilityState(); 1222 shelf->UpdateVisibilityState();
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
1470 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown()); 1472 EXPECT_TRUE(status_area_widget->IsMessageBubbleShown());
1471 } else { 1473 } else {
1472 EXPECT_FALSE(shelf->IsVisible()); 1474 EXPECT_FALSE(shelf->IsVisible());
1473 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown()); 1475 EXPECT_FALSE(status_area_widget->IsMessageBubbleShown());
1474 } 1476 }
1475 } 1477 }
1476 } 1478 }
1477 1479
1478 } // namespace internal 1480 } // namespace internal
1479 } // namespace ash 1481 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698