| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/bind_helpers.h" | 7 #include "base/bind_helpers.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 engine_handler->FocusIn(context); | 264 engine_handler->FocusIn(context); |
| 265 | 265 |
| 266 { | 266 { |
| 267 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:No, Caps:No"); | 267 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:No, Caps:No"); |
| 268 KeyEventDoneCallback callback(false); | 268 KeyEventDoneCallback callback(false); |
| 269 const std::string expected_value = | 269 const std::string expected_value = |
| 270 "onKeyEvent::keydown:a:KeyA:false:false:false:false"; | 270 "onKeyEvent::keydown:a:KeyA:false:false:false:false"; |
| 271 ExtensionTestMessageListener keyevent_listener(expected_value, false); | 271 ExtensionTestMessageListener keyevent_listener(expected_value, false); |
| 272 | 272 |
| 273 ui::KeyEvent key_event( | 273 ui::KeyEvent key_event( |
| 274 ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::KEY_A, ui::EF_NONE); | 274 ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::US_A, ui::EF_NONE); |
| 275 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = | 275 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = |
| 276 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); | 276 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); |
| 277 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); | 277 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); |
| 278 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); | 278 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); |
| 279 EXPECT_TRUE(keyevent_listener.was_satisfied()); | 279 EXPECT_TRUE(keyevent_listener.was_satisfied()); |
| 280 callback.WaitUntilCalled(); | 280 callback.WaitUntilCalled(); |
| 281 } | 281 } |
| 282 { | 282 { |
| 283 SCOPED_TRACE("KeyDown, Ctrl:Yes, alt:No, Shift:No, Caps:No"); | 283 SCOPED_TRACE("KeyDown, Ctrl:Yes, alt:No, Shift:No, Caps:No"); |
| 284 KeyEventDoneCallback callback(false); | 284 KeyEventDoneCallback callback(false); |
| 285 const std::string expected_value = | 285 const std::string expected_value = |
| 286 "onKeyEvent::keydown:a:KeyA:true:false:false:false"; | 286 "onKeyEvent::keydown:a:KeyA:true:false:false:false"; |
| 287 ExtensionTestMessageListener keyevent_listener(expected_value, false); | 287 ExtensionTestMessageListener keyevent_listener(expected_value, false); |
| 288 | 288 |
| 289 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, | 289 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, |
| 290 ui::VKEY_A, | 290 ui::VKEY_A, |
| 291 ui::DomCode::KEY_A, | 291 ui::DomCode::US_A, |
| 292 ui::EF_CONTROL_DOWN); | 292 ui::EF_CONTROL_DOWN); |
| 293 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = | 293 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = |
| 294 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); | 294 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); |
| 295 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); | 295 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); |
| 296 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); | 296 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); |
| 297 EXPECT_TRUE(keyevent_listener.was_satisfied()); | 297 EXPECT_TRUE(keyevent_listener.was_satisfied()); |
| 298 callback.WaitUntilCalled(); | 298 callback.WaitUntilCalled(); |
| 299 } | 299 } |
| 300 { | 300 { |
| 301 SCOPED_TRACE("KeyDown, Ctrl:No, alt:Yes, Shift:No, Caps:No"); | 301 SCOPED_TRACE("KeyDown, Ctrl:No, alt:Yes, Shift:No, Caps:No"); |
| 302 KeyEventDoneCallback callback(false); | 302 KeyEventDoneCallback callback(false); |
| 303 const std::string expected_value = | 303 const std::string expected_value = |
| 304 "onKeyEvent::keydown:a:KeyA:false:true:false:false"; | 304 "onKeyEvent::keydown:a:KeyA:false:true:false:false"; |
| 305 ExtensionTestMessageListener keyevent_listener(expected_value, false); | 305 ExtensionTestMessageListener keyevent_listener(expected_value, false); |
| 306 | 306 |
| 307 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, | 307 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, |
| 308 ui::VKEY_A, | 308 ui::VKEY_A, |
| 309 ui::DomCode::KEY_A, | 309 ui::DomCode::US_A, |
| 310 ui::EF_ALT_DOWN); | 310 ui::EF_ALT_DOWN); |
| 311 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = | 311 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = |
| 312 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); | 312 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); |
| 313 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); | 313 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); |
| 314 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); | 314 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); |
| 315 EXPECT_TRUE(keyevent_listener.was_satisfied()); | 315 EXPECT_TRUE(keyevent_listener.was_satisfied()); |
| 316 callback.WaitUntilCalled(); | 316 callback.WaitUntilCalled(); |
| 317 } | 317 } |
| 318 { | 318 { |
| 319 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:No"); | 319 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:No"); |
| 320 KeyEventDoneCallback callback(false); | 320 KeyEventDoneCallback callback(false); |
| 321 const std::string expected_value = | 321 const std::string expected_value = |
| 322 "onKeyEvent::keydown:A:KeyA:false:false:true:false"; | 322 "onKeyEvent::keydown:A:KeyA:false:false:true:false"; |
| 323 ExtensionTestMessageListener keyevent_listener(expected_value, false); | 323 ExtensionTestMessageListener keyevent_listener(expected_value, false); |
| 324 | 324 |
| 325 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, | 325 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, |
| 326 ui::VKEY_A, | 326 ui::VKEY_A, |
| 327 ui::DomCode::KEY_A, | 327 ui::DomCode::US_A, |
| 328 ui::EF_SHIFT_DOWN); | 328 ui::EF_SHIFT_DOWN); |
| 329 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = | 329 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = |
| 330 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); | 330 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); |
| 331 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); | 331 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); |
| 332 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); | 332 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); |
| 333 EXPECT_TRUE(keyevent_listener.was_satisfied()); | 333 EXPECT_TRUE(keyevent_listener.was_satisfied()); |
| 334 callback.WaitUntilCalled(); | 334 callback.WaitUntilCalled(); |
| 335 } | 335 } |
| 336 { | 336 { |
| 337 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:No, Caps:Yes"); | 337 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:No, Caps:Yes"); |
| 338 KeyEventDoneCallback callback(false); | 338 KeyEventDoneCallback callback(false); |
| 339 const std::string expected_value = | 339 const std::string expected_value = |
| 340 "onKeyEvent::keydown:A:KeyA:false:false:false:true"; | 340 "onKeyEvent::keydown:A:KeyA:false:false:false:true"; |
| 341 ExtensionTestMessageListener keyevent_listener(expected_value, false); | 341 ExtensionTestMessageListener keyevent_listener(expected_value, false); |
| 342 | 342 |
| 343 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, | 343 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, |
| 344 ui::VKEY_A, | 344 ui::VKEY_A, |
| 345 ui::DomCode::KEY_A, | 345 ui::DomCode::US_A, |
| 346 ui::EF_CAPS_LOCK_DOWN); | 346 ui::EF_CAPS_LOCK_DOWN); |
| 347 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = | 347 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = |
| 348 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); | 348 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); |
| 349 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); | 349 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); |
| 350 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); | 350 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); |
| 351 EXPECT_TRUE(keyevent_listener.was_satisfied()); | 351 EXPECT_TRUE(keyevent_listener.was_satisfied()); |
| 352 callback.WaitUntilCalled(); | 352 callback.WaitUntilCalled(); |
| 353 } | 353 } |
| 354 { | 354 { |
| 355 SCOPED_TRACE("KeyDown, Ctrl:Yes, alt:Yes, Shift:No, Caps:No"); | 355 SCOPED_TRACE("KeyDown, Ctrl:Yes, alt:Yes, Shift:No, Caps:No"); |
| 356 KeyEventDoneCallback callback(false); | 356 KeyEventDoneCallback callback(false); |
| 357 const std::string expected_value = | 357 const std::string expected_value = |
| 358 "onKeyEvent::keydown:a:KeyA:true:true:false:false"; | 358 "onKeyEvent::keydown:a:KeyA:true:true:false:false"; |
| 359 ExtensionTestMessageListener keyevent_listener(expected_value, false); | 359 ExtensionTestMessageListener keyevent_listener(expected_value, false); |
| 360 | 360 |
| 361 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, | 361 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, |
| 362 ui::VKEY_A, | 362 ui::VKEY_A, |
| 363 ui::DomCode::KEY_A, | 363 ui::DomCode::US_A, |
| 364 ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN); | 364 ui::EF_ALT_DOWN | ui::EF_CONTROL_DOWN); |
| 365 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = | 365 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = |
| 366 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); | 366 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); |
| 367 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); | 367 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); |
| 368 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); | 368 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); |
| 369 EXPECT_TRUE(keyevent_listener.was_satisfied()); | 369 EXPECT_TRUE(keyevent_listener.was_satisfied()); |
| 370 callback.WaitUntilCalled(); | 370 callback.WaitUntilCalled(); |
| 371 } | 371 } |
| 372 { | 372 { |
| 373 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:Yes"); | 373 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:Yes"); |
| 374 KeyEventDoneCallback callback(false); | 374 KeyEventDoneCallback callback(false); |
| 375 const std::string expected_value = | 375 const std::string expected_value = |
| 376 "onKeyEvent::keydown:a:KeyA:false:false:true:true"; | 376 "onKeyEvent::keydown:a:KeyA:false:false:true:true"; |
| 377 ExtensionTestMessageListener keyevent_listener(expected_value, false); | 377 ExtensionTestMessageListener keyevent_listener(expected_value, false); |
| 378 | 378 |
| 379 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, | 379 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, |
| 380 ui::VKEY_A, | 380 ui::VKEY_A, |
| 381 ui::DomCode::KEY_A, | 381 ui::DomCode::US_A, |
| 382 ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN); | 382 ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN); |
| 383 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = | 383 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = |
| 384 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); | 384 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); |
| 385 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); | 385 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); |
| 386 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); | 386 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); |
| 387 EXPECT_TRUE(keyevent_listener.was_satisfied()); | 387 EXPECT_TRUE(keyevent_listener.was_satisfied()); |
| 388 callback.WaitUntilCalled(); | 388 callback.WaitUntilCalled(); |
| 389 } | 389 } |
| 390 // Media keys cases. | 390 // Media keys cases. |
| 391 const struct { | 391 const struct { |
| (...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1045 EXPECT_EQ("", mock_input_context->last_commit_text()); | 1045 EXPECT_EQ("", mock_input_context->last_commit_text()); |
| 1046 } | 1046 } |
| 1047 | 1047 |
| 1048 ui::IMEBridge::Get()->SetInputContextHandler(NULL); | 1048 ui::IMEBridge::Get()->SetInputContextHandler(NULL); |
| 1049 ui::IMEBridge::Get()->SetCandidateWindowHandler(NULL); | 1049 ui::IMEBridge::Get()->SetCandidateWindowHandler(NULL); |
| 1050 } | 1050 } |
| 1051 | 1051 |
| 1052 } // namespace | 1052 } // namespace |
| 1053 } // namespace input_method | 1053 } // namespace input_method |
| 1054 } // namespace chromeos | 1054 } // namespace chromeos |
| OLD | NEW |