Add a workaround for crbug.com/139556.

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2012 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/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/display/multi_display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 479 matching lines @@
 TEST_F(AcceleratorControllerTest, ControllerContext) {
   ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   ui::Accelerator accelerator_a2(ui::VKEY_A, ui::EF_NONE);
   ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
 
   accelerator_a.set_type(ui::ET_KEY_PRESSED);
   accelerator_a2.set_type(ui::ET_KEY_RELEASED);
   accelerator_b.set_type(ui::ET_KEY_PRESSED);
 
   EXPECT_FALSE(GetController()->context()->repeated());
-  EXPECT_EQ(ui::ET_UNKNOWN, GetController()->context()->previous_event_type());
+  EXPECT_EQ(ui::ET_UNKNOWN,
+            GetController()->context()->previous_accelerator().type());
 
   GetController()->context()->UpdateContext(accelerator_a);
   EXPECT_FALSE(GetController()->context()->repeated());
-  EXPECT_EQ(ui::ET_KEY_PRESSED,
-            GetController()->context()->previous_event_type());
+  EXPECT_EQ(ui::ET_UNKNOWN,
+            GetController()->context()->previous_accelerator().type());
 
   GetController()->context()->UpdateContext(accelerator_a2);
   EXPECT_FALSE(GetController()->context()->repeated());
   EXPECT_EQ(ui::ET_KEY_PRESSED,
-            GetController()->context()->previous_event_type());
+            GetController()->context()->previous_accelerator().type());
 
   GetController()->context()->UpdateContext(accelerator_a2);
   EXPECT_TRUE(GetController()->context()->repeated());
   EXPECT_EQ(ui::ET_KEY_RELEASED,
-            GetController()->context()->previous_event_type());
+            GetController()->context()->previous_accelerator().type());
 
   GetController()->context()->UpdateContext(accelerator_b);
   EXPECT_FALSE(GetController()->context()->repeated());
   EXPECT_EQ(ui::ET_KEY_RELEASED,
-            GetController()->context()->previous_event_type());
+            GetController()->context()->previous_accelerator().type());
 }
 
 TEST_F(AcceleratorControllerTest, SuppressToggleMaximized) {
   scoped_ptr<aura::Window> window(
       aura::test::CreateTestWindowWithBounds(gfx::Rect(5, 5, 20, 20), NULL));
   wm::ActivateWindow(window.get());
   const ui::Accelerator accelerator(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator empty_accelerator;
 
   // Toggling not suppressed.
@@ skipping 492 matching lines @@
         ui::VKEY_X,
         ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
     const ReleaseAccelerator shift_alt_x(ui::VKEY_X,
                                          ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
 
     EXPECT_FALSE(ProcessWithContext(shift_alt_press));
     EXPECT_FALSE(ProcessWithContext(shift_alt_x_press));
     EXPECT_FALSE(ProcessWithContext(shift_alt_x));
     EXPECT_FALSE(ProcessWithContext(shift_alt));
     EXPECT_EQ(2, delegate->handle_next_ime_count());
+
+    // But we _should_ if X is either VKEY_RETURN or VKEY_SPACE.
+    // TODO(nona|mazda): Remove this when crbug.com/139556 in a better way.
+    const ui::Accelerator shift_alt_return_press(
+        ui::VKEY_RETURN,
+        ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
+    const ReleaseAccelerator shift_alt_return(
+        ui::VKEY_RETURN,
+        ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
+
+    EXPECT_FALSE(ProcessWithContext(shift_alt_press));
+    EXPECT_FALSE(ProcessWithContext(shift_alt_return_press));
+    EXPECT_FALSE(ProcessWithContext(shift_alt_return));
+    EXPECT_TRUE(ProcessWithContext(shift_alt));
+    EXPECT_EQ(3, delegate->handle_next_ime_count());
+
+    const ui::Accelerator shift_alt_space_press(
+        ui::VKEY_SPACE,
+        ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
+    const ReleaseAccelerator shift_alt_space(
+        ui::VKEY_SPACE,
+        ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
+
+    EXPECT_FALSE(ProcessWithContext(shift_alt_press));
+    EXPECT_FALSE(ProcessWithContext(shift_alt_space_press));
+    EXPECT_FALSE(ProcessWithContext(shift_alt_space));
+    EXPECT_TRUE(ProcessWithContext(shift_alt));
+    EXPECT_EQ(4, delegate->handle_next_ime_count());
   }
 
 #if defined(OS_CHROMEOS)
   // Test IME shortcuts again with unnormalized accelerators (Chrome OS only).
   {
     const ui::Accelerator shift_alt_press(ui::VKEY_MENU, ui::EF_SHIFT_DOWN);
     const ReleaseAccelerator shift_alt(ui::VKEY_MENU, ui::EF_SHIFT_DOWN);
     const ui::Accelerator alt_shift_press(ui::VKEY_SHIFT, ui::EF_ALT_DOWN);
     const ReleaseAccelerator alt_shift(ui::VKEY_SHIFT, ui::EF_ALT_DOWN);
 
@@ skipping 18 matching lines @@
 
     EXPECT_FALSE(ProcessWithContext(shift_alt_press));
     EXPECT_FALSE(ProcessWithContext(shift_alt_x_press));
     EXPECT_FALSE(ProcessWithContext(shift_alt_x));
     EXPECT_FALSE(ProcessWithContext(shift_alt));
     EXPECT_EQ(2, delegate->handle_next_ime_count());
   }
 #endif
 }
 
+// TODO(nona|mazda): Remove this when crbug.com/139556 in a better way.
+TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsWorkaround139556) {
+  // The workaround for crbug.com/139556 depends on the fact that we don't
+  // use Shift+Alt+Enter/Space with ET_KEY_PRESSED as an accelerator. Test it.
+  const ui::Accelerator shift_alt_return_press(
+      ui::VKEY_RETURN,
+      ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
+  EXPECT_FALSE(ProcessWithContext(shift_alt_return_press));
+  const ui::Accelerator shift_alt_space_press(
+      ui::VKEY_SPACE,
+      ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN);
+  EXPECT_FALSE(ProcessWithContext(shift_alt_space_press));
+}
+
 TEST_F(AcceleratorControllerTest, ReservedAccelerators) {
   // (Shift+)Alt+Tab and Chrome OS top-row keys are reserved.
   EXPECT_TRUE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_TAB, ui::EF_ALT_DOWN)));
   EXPECT_TRUE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN)));
 #if defined(OS_CHROMEOS)
   EXPECT_TRUE(GetController()->IsReservedAccelerator(
       ui::Accelerator(ui::VKEY_POWER, ui::EF_NONE)));
 #endif
@@ skipping 142 matching lines @@
     EXPECT_EQ(f9, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(ProcessWithContext(f10));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(f10, delegate->last_accelerator());
   }
 }
 #endif
 
 }  // namespace ash