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

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

Issue 2732573002: chromeos: moves more ash tests to run on mash (Closed)
Patch Set: fix bug ref Created 3 years, 9 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
« no previous file with comments | « ash/focus_cycler_unittest.cc ('k') | ash/sticky_keys/sticky_keys_overlay_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/common/shelf/shelf_layout_manager.h" 5 #include "ash/common/shelf/shelf_layout_manager.h"
6 6
7 #include "ash/common/accelerators/accelerator_controller.h" 7 #include "ash/common/accelerators/accelerator_controller.h"
8 #include "ash/common/accelerators/accelerator_table.h" 8 #include "ash/common/accelerators/accelerator_table.h"
9 #include "ash/common/focus_cycler.h" 9 #include "ash/common/focus_cycler.h"
10 #include "ash/common/session/session_controller.h" 10 #include "ash/common/session/session_controller.h"
(...skipping 734 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 } 745 }
746 746
747 // Test the behavior of the shelf when it is auto hidden and it is on the 747 // Test the behavior of the shelf when it is auto hidden and it is on the
748 // boundary between the primary and the secondary display. 748 // boundary between the primary and the secondary display.
749 TEST_F(ShelfLayoutManagerTest, AutoHideShelfOnScreenBoundary) { 749 TEST_F(ShelfLayoutManagerTest, AutoHideShelfOnScreenBoundary) {
750 // TODO: investigate failure in mash, http://crbug.com/695686. 750 // TODO: investigate failure in mash, http://crbug.com/695686.
751 if (WmShell::Get()->IsRunningInMash()) 751 if (WmShell::Get()->IsRunningInMash())
752 return; 752 return;
753 753
754 UpdateDisplay("800x600,800x600"); 754 UpdateDisplay("800x600,800x600");
755 // TODO: SetLayoutForCurrentDisplays() needs to ported to mash.
756 // http://crbug.com/698043.
755 Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays( 757 Shell::GetInstance()->display_manager()->SetLayoutForCurrentDisplays(
756 display::test::CreateDisplayLayout(display_manager(), 758 display::test::CreateDisplayLayout(display_manager(),
757 display::DisplayPlacement::RIGHT, 0)); 759 display::DisplayPlacement::RIGHT, 0));
758 // Put the primary monitor's shelf on the display boundary. 760 // Put the primary monitor's shelf on the display boundary.
759 WmShelf* shelf = GetPrimaryShelf(); 761 WmShelf* shelf = GetPrimaryShelf();
760 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT); 762 shelf->SetAlignment(SHELF_ALIGNMENT_RIGHT);
761 763
762 // Create a window because the shelf is always shown when no windows are 764 // Create a window because the shelf is always shown when no windows are
763 // visible. 765 // visible.
764 CreateTestWidget(); 766 CreateTestWidget();
(...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after
1809 // Open keyboard in sticky mode. 1811 // Open keyboard in sticky mode.
1810 kb_controller->ShowKeyboard(true); 1812 kb_controller->ShowKeyboard(true);
1811 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds()); 1813 layout_manager->OnKeyboardBoundsChanging(keyboard_bounds());
1812 1814
1813 // Work area should be changed. 1815 // Work area should be changed.
1814 EXPECT_NE(orig_work_area, 1816 EXPECT_NE(orig_work_area,
1815 display::Screen::GetScreen()->GetPrimaryDisplay().work_area()); 1817 display::Screen::GetScreen()->GetPrimaryDisplay().work_area());
1816 } 1818 }
1817 1819
1818 } // namespace ash 1820 } // namespace ash
OLDNEW
« no previous file with comments | « ash/focus_cycler_unittest.cc ('k') | ash/sticky_keys/sticky_keys_overlay_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698