Make mash register initial batch of accelerators in single shot.

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/common/accelerators/accelerator_controller.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/accelerators/accelerator_table.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
@@ skipping 316 matching lines @@
   ewh->HandleAccelerator();
   EXPECT_FALSE(is_idle(ewh));
   EXPECT_TRUE(is_ui_shown(ewh));
 
   // Exit ash and there should be no crash
 }
 #endif  // !defined(OS_WIN)
 
 TEST_F(AcceleratorControllerTest, Register) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+  GetController()->Register(accelerators, &target);
 
   // The registered accelerator is processed.
   EXPECT_TRUE(ProcessInController(accelerator_a));
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, RegisterMultipleTarget) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
+
   TestTarget target1;
-  GetController()->Register(accelerator_a, &target1);
+  GetController()->Register(accelerators, &target1);
   TestTarget target2;
-  GetController()->Register(accelerator_a, &target2);
+  GetController()->Register(accelerators, &target2);
 
   // If multiple targets are registered with the same accelerator, the target
   // registered later processes the accelerator.
   EXPECT_TRUE(ProcessInController(accelerator_a));
   EXPECT_EQ(0, target1.accelerator_pressed_count());
   EXPECT_EQ(1, target2.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, Unregister) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a,
+                                                      accelerator_b};
+
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
-  const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
-  GetController()->Register(accelerator_b, &target);
+  GetController()->Register(accelerators, &target);
 
   // Unregistering a different accelerator does not affect the other
   // accelerator.
   GetController()->Unregister(accelerator_b, &target);
   EXPECT_TRUE(ProcessInController(accelerator_a));
   EXPECT_EQ(1, target.accelerator_pressed_count());
 
   // The unregistered accelerator is no longer processed.
   target.reset();
   GetController()->Unregister(accelerator_a, &target);
   EXPECT_FALSE(ProcessInController(accelerator_a));
   EXPECT_EQ(0, target.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, UnregisterAll) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a,
+                                                      accelerator_b};
   TestTarget target1;
-  GetController()->Register(accelerator_a, &target1);
-  const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
-  GetController()->Register(accelerator_b, &target1);
+  GetController()->Register(accelerators, &target1);
+
   const ui::Accelerator accelerator_c(ui::VKEY_C, ui::EF_NONE);
+  const std::vector<ui::Accelerator>& accelerators_2 = {accelerator_c};
   TestTarget target2;
-  GetController()->Register(accelerator_c, &target2);
+  GetController()->Register(accelerators_2, &target2);
   GetController()->UnregisterAll(&target1);
 
   // All the accelerators registered for |target1| are no longer processed.
   EXPECT_FALSE(ProcessInController(accelerator_a));
   EXPECT_FALSE(ProcessInController(accelerator_b));
   EXPECT_EQ(0, target1.accelerator_pressed_count());
 
   // UnregisterAll with a different target does not affect the other target.
   EXPECT_TRUE(ProcessInController(accelerator_c));
   EXPECT_EQ(1, target2.accelerator_pressed_count());
 }
 
 TEST_F(AcceleratorControllerTest, Process) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
   TestTarget target1;
-  GetController()->Register(accelerator_a, &target1);
+  GetController()->Register(accelerators, &target1);
 
   // The registered accelerator is processed.
   EXPECT_TRUE(ProcessInController(accelerator_a));
   EXPECT_EQ(1, target1.accelerator_pressed_count());
 
   // The non-registered accelerator is not processed.
   const ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_NONE);
   EXPECT_FALSE(ProcessInController(accelerator_b));
 }
 
 TEST_F(AcceleratorControllerTest, IsRegistered) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator accelerator_shift_a(ui::VKEY_A, ui::EF_SHIFT_DOWN);
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
+
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+  GetController()->Register(accelerators, &target);
   EXPECT_TRUE(GetController()->IsRegistered(accelerator_a));
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_a));
 }
 
 TEST_F(AcceleratorControllerTest, WindowSnap) {
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   wm::WindowState* window_state = wm::GetWindowState(window.get());
@@ skipping 217 matching lines @@
   gfx::Rect docked_bounds = window->GetBoundsInScreen();
   GetController()->PerformActionIfEnabled(WINDOW_POSITION_CENTER);
   // It should not get centered and should remain docked.
   EXPECT_EQ(kShellWindowId_DockedContainer, window->parent()->id());
   EXPECT_EQ(docked_bounds.ToString(), window->GetBoundsInScreen().ToString());
 }
 
 TEST_F(AcceleratorControllerTest, AutoRepeat) {
   ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_CONTROL_DOWN);
   accelerator_a.set_type(ui::ET_KEY_PRESSED);
+
+  const std::vector<ui::Accelerator>& accelerators_a = {accelerator_a};
+
   TestTarget target_a;
-  GetController()->Register(accelerator_a, &target_a);
+  GetController()->Register(accelerators_a, &target_a);
   ui::Accelerator accelerator_b(ui::VKEY_B, ui::EF_CONTROL_DOWN);
   accelerator_b.set_type(ui::ET_KEY_PRESSED);
   TestTarget target_b;
-  GetController()->Register(accelerator_b, &target_b);
+
+  const std::vector<ui::Accelerator>& accelerators_b = {accelerator_b};
+  GetController()->Register(accelerators_b, &target_b);
 
   ui::test::EventGenerator& generator = GetEventGenerator();
   generator.PressKey(ui::VKEY_A, ui::EF_CONTROL_DOWN);
   generator.ReleaseKey(ui::VKEY_A, ui::EF_CONTROL_DOWN);
 
   EXPECT_EQ(1, target_a.accelerator_pressed_count());
   EXPECT_EQ(0, target_a.accelerator_repeat_count());
 
   // Long press should generate one
   generator.PressKey(ui::VKEY_A, ui::EF_CONTROL_DOWN);
@@ skipping 78 matching lines @@
 #define MAYBE_ProcessOnce ProcessOnce
 #endif
 
 #if defined(OS_WIN) || defined(USE_X11)
 TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) {
   // The IME event filter interferes with the basic key event propagation we
   // attempt to do here, so we disable it.
   DisableIME();
   ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target;
-  GetController()->Register(accelerator_a, &target);
+
+  const std::vector<ui::Accelerator>& accelerators = {accelerator_a};
+  GetController()->Register(accelerators, &target);
 
   // The accelerator is processed only once.
   ui::EventProcessor* dispatcher =
       Shell::GetPrimaryRootWindow()->GetHost()->event_processor();
 #if defined(OS_WIN)
   MSG msg1 = {NULL, WM_KEYDOWN, ui::VKEY_A, 0};
   ui::KeyEvent key_event1(msg1);
   ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&key_event1);
   EXPECT_TRUE(key_event1.handled() || details.dispatcher_destroyed);
 
@@ skipping 642 matching lines @@
     EXPECT_TRUE(IsMessageCenterEmpty());
 
     // If the action is LOCK_SCREEN, we must reset the state by unlocking the
     // screen before we proceed testing the rest of accelerators.
     ResetStateIfNeeded();
   }
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash