Index: ash/root_window_controller_unittest.cc |
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc |
index 3edd28013e160131fde6d374312f1c40f5da724c..4666eadcdf9297e5fab3b08627049abc560a676b 100644 |
--- a/ash/root_window_controller_unittest.cc |
+++ b/ash/root_window_controller_unittest.cc |
@@ -583,6 +583,13 @@ typedef test::NoSessionAshTestBase NoSessionRootWindowControllerTest; |
// Make sure that an event handler exists for entire display area. |
TEST_F(NoSessionRootWindowControllerTest, Event) { |
+ // Hide the shelf since it might otherwise get an event target. |
+ RootWindowController* controller = Shell::GetPrimaryRootWindowController(); |
+ ShelfLayoutManager* shelf_layout_manager = |
+ controller->GetShelfLayoutManager(); |
+ shelf_layout_manager->SetAutoHideBehavior( |
+ ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN); |
+ |
aura::Window* root = Shell::GetPrimaryRootWindow(); |
const gfx::Size size = root->bounds().size(); |
aura::Window* event_target = root->GetEventHandlerForPoint(gfx::Point(0, 0)); |