IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash.

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2011 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/ime/event.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/aura_shell_test_base.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/event.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 
@@ skipping 137 matching lines @@
       default_container);
   ActivateWindow(window);
 
   const ui::Accelerator accelerator_a(ui::VKEY_A, false, false, false);
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
 
   // The accelerator is processed only once.
 #if defined(OS_WIN)
   MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 };
-  aura::KeyEvent key_event1(msg1, false);
+  TranslatedKeyEvent key_event1(msg1, false);
   EXPECT_TRUE(aura::RootWindow::GetInstance()->DispatchKeyEvent(&key_event1));
 
   MSG msg2 = { NULL, WM_CHAR, L'A', 0 };
-  aura::KeyEvent key_event2(msg2, true);
+  TranslatedKeyEvent key_event2(msg2, true);
   EXPECT_FALSE(aura::RootWindow::GetInstance()->DispatchKeyEvent(&key_event2));
 
   MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 };
-  aura::KeyEvent key_event3(msg3, false);
+  TranslatedKeyEvent key_event3(msg3, false);
   EXPECT_FALSE(aura::RootWindow::GetInstance()->DispatchKeyEvent(&key_event3));
 #elif defined(USE_X11)
   XEvent key_event;
   ui::InitXKeyEventForTesting(ui::ET_KEY_PRESSED,
                               ui::VKEY_A,
                               0,
                               &key_event);
-  EXPECT_TRUE(aura::RootWindow::GetInstance()->GetDispatcher()->Dispatch(
-      &key_event));
+  TranslatedKeyEvent key_event1(&key_event, false);
+  EXPECT_TRUE(aura::RootWindow::GetInstance()->DispatchKeyEvent(&key_event1));
+
+  TranslatedKeyEvent key_event2(&key_event, true);
+  EXPECT_FALSE(aura::RootWindow::GetInstance()->DispatchKeyEvent(&key_event2));
+
+  ui::InitXKeyEventForTesting(ui::ET_KEY_RELEASED,
+                              ui::VKEY_A,
+                              0,
+                              &key_event);
+  TranslatedKeyEvent key_event3(&key_event, false);
+  EXPECT_FALSE(aura::RootWindow::GetInstance()->DispatchKeyEvent(&key_event3));
 #endif
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 #endif
 
 TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
   // A focused window must exist for accelerators to be processed.
   aura::Window* default_container =
       ash::Shell::GetInstance()->GetContainer(
           internal::kShellWindowId_DefaultContainer);
@@ skipping 133 matching lines @@
   lock_modal_window->Show();
   EXPECT_FALSE(GetController()->Process(cycle_forward));
   EXPECT_FALSE(GetController()->Process(cycle_backward));
   lock_screen_window->Hide();
   EXPECT_TRUE(GetController()->Process(cycle_forward));
   EXPECT_TRUE(GetController()->Process(cycle_backward));
 }
 
 }  // namespace test
 }  // namespace ash