Blocked volume up/down events that originated from remapped function keys.

ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 
 #include "ash/accelerometer/accelerometer_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "ash/test/test_lock_state_controller_delegate.h"
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_volume_control_delegate.h"
 #include "ash/wm/maximize_mode/internal_input_device_list.h"
 #include "ash/wm/maximize_mode/maximize_mode_event_blocker.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/events/event_handler.h"
 #include "ui/gfx/vector3d_f.h"
 #include "ui/message_center/message_center.h"
 
+#if defined(USE_X11)
+#include "ui/events/test/events_test_utils_x11.h"
+#endif
+
 namespace ash {
 
 namespace {
 
 const float kDegreesToRadians = 3.14159265f / 180.0f;
 
 // Filter to count the number of events seen.
 class EventCounter : public ui::EventHandler {
  public:
   EventCounter();
@@ skipping 375 matching lines @@
   event_generator.ReleaseKey(ui::VKEY_POWER, 0);
   EXPECT_EQ(0, delegate->handle_take_screenshot_count());
 
   // Holding volume down and pressing power takes a screenshot.
   event_generator.PressKey(ui::VKEY_VOLUME_DOWN, 0);
   event_generator.PressKey(ui::VKEY_POWER, 0);
   event_generator.ReleaseKey(ui::VKEY_POWER, 0);
   EXPECT_EQ(1, delegate->handle_take_screenshot_count());
   event_generator.ReleaseKey(ui::VKEY_VOLUME_DOWN, 0);
 }
-#endif  // OS_CHROMEOS
 
-// Tests that maximize mode does not block Volume Up & Down events.
+#if defined(USE_X11)
+// Tests that maximize mode allows volume up/down events originating
+// from dedicated buttons versus remapped keyboard buttons.
 TEST_F(MaximizeModeControllerTest, AllowsVolumeControl) {
   aura::Window* root = Shell::GetPrimaryRootWindow();
   aura::test::EventGenerator event_generator(root, root);
 
   TestVolumeControlDelegate* volume_delegate =
       new TestVolumeControlDelegate(true);
   ash::Shell::GetInstance()->system_tray_delegate()->SetVolumeControlDelegate(
       scoped_ptr<VolumeControlDelegate>(volume_delegate).Pass());
 
   // Trigger maximize mode by opening to 270 to begin the test in maximize mode.
   TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, -1.0f),
                              gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
   ASSERT_TRUE(IsMaximizeModeStarted());
 
+  ui::ScopedXI2Event xevent;
+
+  // Verify F9 button event is blocked
+  ASSERT_EQ(0, volume_delegate->handle_volume_down_count());
+  xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_DOWN, ui::EF_NONE);
+  ui::KeyEvent press_f9(xevent, false /*is_char*/);

[oshima, 2014/05/27 17:15:46]

/* is_char */

[bruthig, 2014/05/30 14:10:26]

Done.

+  press_f9.set_flags(ui::EF_FUNCTION_KEY);
+  event_generator.Dispatch(&press_f9);
+  EXPECT_EQ(0, volume_delegate->handle_volume_down_count());
+
+  // Verify F10 button event is blocked
+  ASSERT_EQ(0, volume_delegate->handle_volume_up_count());
+  xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_UP, ui::EF_NONE);
+  ui::KeyEvent press_f10(xevent, false /*is_char*/);
+  press_f10.set_flags(ui::EF_FUNCTION_KEY);
+  event_generator.Dispatch(&press_f10);
+  EXPECT_EQ(0, volume_delegate->handle_volume_up_count());
+
   // Verify volume down button event is not blocked
   ASSERT_EQ(0, volume_delegate->handle_volume_down_count());
-  event_generator.PressKey(ui::VKEY_VOLUME_DOWN, 0);
-  event_generator.ReleaseKey(ui::VKEY_VOLUME_DOWN, 0);
+  xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_DOWN, ui::EF_NONE);
+  ui::KeyEvent press_vol_down(xevent, false /*is_char*/);
+  event_generator.Dispatch(&press_vol_down);
   EXPECT_EQ(1, volume_delegate->handle_volume_down_count());
 
   // Verify volume up event is not blocked
   ASSERT_EQ(0, volume_delegate->handle_volume_up_count());
-  event_generator.PressKey(ui::VKEY_VOLUME_UP, 0);
-  event_generator.ReleaseKey(ui::VKEY_VOLUME_UP, 0);
+  xevent.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_VOLUME_UP, ui::EF_NONE);
+  ui::KeyEvent press_vol_up(xevent, false /*is_char*/);
+  event_generator.Dispatch(&press_vol_up);
   EXPECT_EQ(1, volume_delegate->handle_volume_up_count());
 }
+#endif  // USE_X11
+#endif  // OS_CHROMEOS

[oshima, 2014/05/27 17:15:46]

Does this need to be cros only?
asking because linux_aura now compiles ash.

[bruthig, 2014/05/30 14:10:26]

Done.

 
 TEST_F(MaximizeModeControllerTest, LaptopTest) {
   // Feeds in sample accelerometer data and verifies that there are no
   // transitions into touchview / maximize mode while shaking the device around
   // with the hinge at less than 180 degrees.
   ASSERT_TRUE(kAccelerometerLaptopModeTestDataLength % 6 == 0);
   for (size_t i = 0; i < kAccelerometerLaptopModeTestDataLength / 6; ++i) {
     gfx::Vector3dF base(kAccelerometerLaptopModeTestData[i * 6],
                         kAccelerometerLaptopModeTestData[i * 6 + 1],
                         kAccelerometerLaptopModeTestData[i * 6 + 2]);
@@ skipping 132 matching lines @@
   ASSERT_NE(gfx::Display::ROTATE_90, GetInternalDisplayRotation());
   TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 1.0f, 0.0f),
                              gfx::Vector3dF(0.0f, 1.0f, 0.0f));
   ASSERT_EQ(gfx::Display::ROTATE_90, GetInternalDisplayRotation());
   EXPECT_EQ(0u, message_center->NotificationCount());
   EXPECT_FALSE(message_center->HasPopupNotifications());
 }
 #endif
 
 }  // namespace ash