| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/wm/maximize_mode/maximize_mode_controller.h" | 5 #include "ash/wm/maximize_mode/maximize_mode_controller.h" |
| 6 | 6 |
| 7 #include "ash/accelerometer/accelerometer_controller.h" | 7 #include "ash/accelerometer/accelerometer_controller.h" |
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/system/tray/system_tray_delegate.h" | 10 #include "ash/system/tray/system_tray_delegate.h" |
| 11 #include "ash/test/ash_test_base.h" | 11 #include "ash/test/ash_test_base.h" |
| 12 #include "ash/test/display_manager_test_api.h" | 12 #include "ash/test/display_manager_test_api.h" |
| 13 #include "ash/test/test_lock_state_controller_delegate.h" | 13 #include "ash/test/test_lock_state_controller_delegate.h" |
| 14 #include "ash/test/test_screenshot_delegate.h" | 14 #include "ash/test/test_screenshot_delegate.h" |
| 15 #include "ash/test/test_system_tray_delegate.h" | 15 #include "ash/test/test_system_tray_delegate.h" |
| 16 #include "ash/test/test_volume_control_delegate.h" | 16 #include "ash/test/test_volume_control_delegate.h" |
| 17 #include "ash/wm/maximize_mode/internal_input_device_list.h" | 17 #include "ash/wm/maximize_mode/internal_input_device_list.h" |
| 18 #include "ash/wm/maximize_mode/maximize_mode_event_blocker.h" | 18 #include "ash/wm/maximize_mode/maximize_mode_event_blocker.h" |
| 19 #include "ui/aura/test/event_generator.h" | 19 #include "ui/aura/test/event_generator.h" |
| 20 #include "ui/events/event_handler.h" | 20 #include "ui/events/event_handler.h" |
| 21 #include "ui/gfx/vector3d_f.h" | 21 #include "ui/gfx/vector3d_f.h" |
| 22 #include "ui/message_center/message_center.h" | 22 #include "ui/message_center/message_center.h" |
| 23 | 23 |
| 24 #if defined(USE_X11) |
| 25 #include "ui/events/test/events_test_utils_x11.h" |
| 26 #endif |
| 27 |
| 24 namespace ash { | 28 namespace ash { |
| 25 | 29 |
| 26 namespace { | 30 namespace { |
| 27 | 31 |
| 28 const float kDegreesToRadians = 3.14159265f / 180.0f; | 32 const float kDegreesToRadians = 3.14159265f / 180.0f; |
| 29 | 33 |
| 30 // Filter to count the number of events seen. | 34 // Filter to count the number of events seen. |
| 31 class EventCounter : public ui::EventHandler { | 35 class EventCounter : public ui::EventHandler { |
| 32 public: | 36 public: |
| 33 EventCounter(); | 37 EventCounter(); |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 409 event_generator.ReleaseKey(ui::VKEY_POWER, 0); | 413 event_generator.ReleaseKey(ui::VKEY_POWER, 0); |
| 410 EXPECT_EQ(0, delegate->handle_take_screenshot_count()); | 414 EXPECT_EQ(0, delegate->handle_take_screenshot_count()); |
| 411 | 415 |
| 412 // Holding volume down and pressing power takes a screenshot. | 416 // Holding volume down and pressing power takes a screenshot. |
| 413 event_generator.PressKey(ui::VKEY_VOLUME_DOWN, 0); | 417 event_generator.PressKey(ui::VKEY_VOLUME_DOWN, 0); |
| 414 event_generator.PressKey(ui::VKEY_POWER, 0); | 418 event_generator.PressKey(ui::VKEY_POWER, 0); |
| 415 event_generator.ReleaseKey(ui::VKEY_POWER, 0); | 419 event_generator.ReleaseKey(ui::VKEY_POWER, 0); |
| 416 EXPECT_EQ(1, delegate->handle_take_screenshot_count()); | 420 EXPECT_EQ(1, delegate->handle_take_screenshot_count()); |
| 417 event_generator.ReleaseKey(ui::VKEY_VOLUME_DOWN, 0); | 421 event_generator.ReleaseKey(ui::VKEY_VOLUME_DOWN, 0); |
| 418 } | 422 } |
| 419 #endif // OS_CHROMEOS | |
| 420 | 423 |
| 421 // Tests that maximize mode does not block Volume Up & Down events. | 424 // Tests that maximize mode allows volume up/down events originating |
| 425 // from dedicated buttons versus remapped keyboard buttons. |
| 422 TEST_F(MaximizeModeControllerTest, AllowsVolumeControl) { | 426 TEST_F(MaximizeModeControllerTest, AllowsVolumeControl) { |
| 423 aura::Window* root = Shell::GetPrimaryRootWindow(); | 427 aura::Window* root = Shell::GetPrimaryRootWindow(); |
| 424 aura::test::EventGenerator event_generator(root, root); | 428 aura::test::EventGenerator event_generator(root, root); |
| 425 | 429 |
| 426 TestVolumeControlDelegate* volume_delegate = | 430 TestVolumeControlDelegate* volume_delegate = |
| 427 new TestVolumeControlDelegate(true); | 431 new TestVolumeControlDelegate(true); |
| 428 ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate( | 432 ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate( |
| 429 scoped_ptr<VolumeControlDelegate>(volume_delegate).Pass()); | 433 scoped_ptr<VolumeControlDelegate>(volume_delegate).Pass()); |
| 430 | 434 |
| 431 // Trigger maximize mode by opening to 270 to begin the test in maximize mode. | 435 // Trigger maximize mode by opening to 270 to begin the test in maximize mode. |
| 432 TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, -1.0f), | 436 TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, -1.0f), |
| 433 gfx::Vector3dF(-1.0f, 0.0f, 0.0f)); | 437 gfx::Vector3dF(-1.0f, 0.0f, 0.0f)); |
| 434 ASSERT_TRUE(IsMaximizeModeStarted()); | 438 ASSERT_TRUE(IsMaximizeModeStarted()); |
| 435 | 439 |
| 440 ui::ScopedXI2Event xevent; |
| 441 |
| 442 // Verify F9 button event is blocked |
| 443 ASSERT_EQ(0, volume_delegate->handle_volume_down_count()); |
| 444 xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_DOWN, ui::EF_NONE); |
| 445 ui::KeyEvent press_f9(xevent, false /*is_char*/); |
| 446 press_f9.set_flags(ui::EF_FUNCTION_KEY); |
| 447 event_generator.Dispatch(&press_f9); |
| 448 EXPECT_EQ(0, volume_delegate->handle_volume_down_count()); |
| 449 |
| 450 // Verify F10 button event is blocked |
| 451 ASSERT_EQ(0, volume_delegate->handle_volume_up_count()); |
| 452 xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_UP, ui::EF_NONE); |
| 453 ui::KeyEvent press_f10(xevent, false /*is_char*/); |
| 454 press_f10.set_flags(ui::EF_FUNCTION_KEY); |
| 455 event_generator.Dispatch(&press_f10); |
| 456 EXPECT_EQ(0, volume_delegate->handle_volume_up_count()); |
| 457 |
| 436 // Verify volume down button event is not blocked | 458 // Verify volume down button event is not blocked |
| 437 ASSERT_EQ(0, volume_delegate->handle_volume_down_count()); | 459 ASSERT_EQ(0, volume_delegate->handle_volume_down_count()); |
| 438 event_generator.PressKey(ui::VKEY_VOLUME_DOWN, 0); | 460 xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_DOWN, ui::EF_NONE); |
| 439 event_generator.ReleaseKey(ui::VKEY_VOLUME_DOWN, 0); | 461 ui::KeyEvent press_vol_down(xevent, false /*is_char*/); |
| 462 event_generator.Dispatch(&press_vol_down); |
| 440 EXPECT_EQ(1, volume_delegate->handle_volume_down_count()); | 463 EXPECT_EQ(1, volume_delegate->handle_volume_down_count()); |
| 441 | 464 |
| 442 // Verify volume up event is not blocked | 465 // Verify volume up event is not blocked |
| 443 ASSERT_EQ(0, volume_delegate->handle_volume_up_count()); | 466 ASSERT_EQ(0, volume_delegate->handle_volume_up_count()); |
| 444 event_generator.PressKey(ui::VKEY_VOLUME_UP, 0); | 467 xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_UP, ui::EF_NONE); |
| 445 event_generator.ReleaseKey(ui::VKEY_VOLUME_UP, 0); | 468 ui::KeyEvent press_vol_up(xevent, false /*is_char*/); |
| 469 event_generator.Dispatch(&press_vol_up); |
| 446 EXPECT_EQ(1, volume_delegate->handle_volume_up_count()); | 470 EXPECT_EQ(1, volume_delegate->handle_volume_up_count()); |
| 447 } | 471 } |
| 472 #endif // OS_CHROMEOS |
| 448 | 473 |
| 449 TEST_F(MaximizeModeControllerTest, LaptopTest) { | 474 TEST_F(MaximizeModeControllerTest, LaptopTest) { |
| 450 // Feeds in sample accelerometer data and verifies that there are no | 475 // Feeds in sample accelerometer data and verifies that there are no |
| 451 // transitions into touchview / maximize mode while shaking the device around | 476 // transitions into touchview / maximize mode while shaking the device around |
| 452 // with the hinge at less than 180 degrees. | 477 // with the hinge at less than 180 degrees. |
| 453 ASSERT_TRUE(kAccelerometerLaptopModeTestDataLength % 6 == 0); | 478 ASSERT_TRUE(kAccelerometerLaptopModeTestDataLength % 6 == 0); |
| 454 for (size_t i = 0; i < kAccelerometerLaptopModeTestDataLength / 6; ++i) { | 479 for (size_t i = 0; i < kAccelerometerLaptopModeTestDataLength / 6; ++i) { |
| 455 gfx::Vector3dF base(kAccelerometerLaptopModeTestData[i * 6], | 480 gfx::Vector3dF base(kAccelerometerLaptopModeTestData[i * 6], |
| 456 kAccelerometerLaptopModeTestData[i * 6 + 1], | 481 kAccelerometerLaptopModeTestData[i * 6 + 1], |
| 457 kAccelerometerLaptopModeTestData[i * 6 + 2]); | 482 kAccelerometerLaptopModeTestData[i * 6 + 2]); |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 ASSERT_NE(gfx::Display::ROTATE_90, GetInternalDisplayRotation()); | 615 ASSERT_NE(gfx::Display::ROTATE_90, GetInternalDisplayRotation()); |
| 591 TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 1.0f, 0.0f), | 616 TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 1.0f, 0.0f), |
| 592 gfx::Vector3dF(0.0f, 1.0f, 0.0f)); | 617 gfx::Vector3dF(0.0f, 1.0f, 0.0f)); |
| 593 ASSERT_EQ(gfx::Display::ROTATE_90, GetInternalDisplayRotation()); | 618 ASSERT_EQ(gfx::Display::ROTATE_90, GetInternalDisplayRotation()); |
| 594 EXPECT_EQ(0u, message_center->NotificationCount()); | 619 EXPECT_EQ(0u, message_center->NotificationCount()); |
| 595 EXPECT_FALSE(message_center->HasPopupNotifications()); | 620 EXPECT_FALSE(message_center->HasPopupNotifications()); |
| 596 } | 621 } |
| 597 #endif | 622 #endif |
| 598 | 623 |
| 599 } // namespace ash | 624 } // namespace ash |
| OLD | NEW |