| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/shared/immersive_fullscreen_controller.h" | 5 #include "ash/shared/immersive_fullscreen_controller.h" |
| 6 | 6 |
| 7 #include "ash/common/shelf/shelf_types.h" | 7 #include "ash/common/shelf/shelf_types.h" |
| 8 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
| 9 #include "ash/common/wm/window_state.h" | 9 #include "ash/common/wm/window_state.h" |
| 10 #include "ash/display/display_manager.h" | 10 #include "ash/display/display_manager.h" |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 lock2.reset(controller()->GetRevealedLock( | 332 lock2.reset(controller()->GetRevealedLock( |
| 333 ImmersiveFullscreenController::ANIMATE_REVEAL_NO)); | 333 ImmersiveFullscreenController::ANIMATE_REVEAL_NO)); |
| 334 lock1.reset(); | 334 lock1.reset(); |
| 335 EXPECT_TRUE(controller()->IsRevealed()); | 335 EXPECT_TRUE(controller()->IsRevealed()); |
| 336 | 336 |
| 337 lock2.reset(); | 337 lock2.reset(); |
| 338 EXPECT_FALSE(controller()->IsRevealed()); | 338 EXPECT_FALSE(controller()->IsRevealed()); |
| 339 } | 339 } |
| 340 | 340 |
| 341 // Test mouse event processing for top-of-screen reveal triggering. | 341 // Test mouse event processing for top-of-screen reveal triggering. |
| 342 TEST_F(ImmersiveFullscreenControllerTest, OnMouseEvent) { | 342 // TODO: ASan failure happens on ChromeOS (https://crbug.com/641828). |
| 343 #if defined(OS_CHROMEOS) |
| 344 #define MAYBE_OnMouseEvent DISABLED_OnMouseEvent |
| 345 #else |
| 346 #define MAYBE_OnMouseEvent OnMouseEvent |
| 347 #endif |
| 348 TEST_F(ImmersiveFullscreenControllerTest, MAYBE_OnMouseEvent) { |
| 343 // Set up initial state. | 349 // Set up initial state. |
| 344 SetEnabled(true); | 350 SetEnabled(true); |
| 345 ASSERT_TRUE(controller()->IsEnabled()); | 351 ASSERT_TRUE(controller()->IsEnabled()); |
| 346 ASSERT_FALSE(controller()->IsRevealed()); | 352 ASSERT_FALSE(controller()->IsRevealed()); |
| 347 | 353 |
| 348 ui::test::EventGenerator& event_generator(GetEventGenerator()); | 354 ui::test::EventGenerator& event_generator(GetEventGenerator()); |
| 349 | 355 |
| 350 gfx::Rect top_container_bounds_in_screen = | 356 gfx::Rect top_container_bounds_in_screen = |
| 351 top_container()->GetBoundsInScreen(); | 357 top_container()->GetBoundsInScreen(); |
| 352 // A position along the top edge of TopContainerView in screen coordinates. | 358 // A position along the top edge of TopContainerView in screen coordinates. |
| (...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1048 SetEnabled(true); | 1054 SetEnabled(true); |
| 1049 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); | 1055 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
| 1050 | 1056 |
| 1051 // Disabling immersive fullscreen maintains the user's auto-hide selection. | 1057 // Disabling immersive fullscreen maintains the user's auto-hide selection. |
| 1052 SetEnabled(false); | 1058 SetEnabled(false); |
| 1053 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); | 1059 window()->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_NORMAL); |
| 1054 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); | 1060 EXPECT_EQ(SHELF_AUTO_HIDE, shelf->GetVisibilityState()); |
| 1055 } | 1061 } |
| 1056 | 1062 |
| 1057 } // namespase ash | 1063 } // namespase ash |
| OLD | NEW |