| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ui/base/ime/input_method_auralinux.h" | 5 #include "ui/base/ime/input_method_auralinux.h" |
| 6 | 6 |
| 7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
| 8 #include "base/strings/string_split.h" | 8 #include "base/strings/string_split.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 10 #include "testing/gtest/include/gtest/gtest.h" |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 | 146 |
| 147 private: | 147 private: |
| 148 DISALLOW_COPY_AND_ASSIGN(LinuxInputMethodContextFactoryForTesting); | 148 DISALLOW_COPY_AND_ASSIGN(LinuxInputMethodContextFactoryForTesting); |
| 149 }; | 149 }; |
| 150 | 150 |
| 151 class InputMethodDelegateForTesting : public internal::InputMethodDelegate { | 151 class InputMethodDelegateForTesting : public internal::InputMethodDelegate { |
| 152 public: | 152 public: |
| 153 InputMethodDelegateForTesting(){}; | 153 InputMethodDelegateForTesting(){}; |
| 154 ~InputMethodDelegateForTesting() override{}; | 154 ~InputMethodDelegateForTesting() override{}; |
| 155 | 155 |
| 156 bool DispatchKeyEventPostIME(const ui::KeyEvent& key_event) override { | 156 ui::EventDispatchDetails DispatchKeyEventPostIME( |
| 157 ui::KeyEvent* key_event) override { |
| 157 std::string action; | 158 std::string action; |
| 158 switch (key_event.type()) { | 159 switch (key_event->type()) { |
| 159 case ET_KEY_PRESSED: | 160 case ET_KEY_PRESSED: |
| 160 action = "keydown:"; | 161 action = "keydown:"; |
| 161 break; | 162 break; |
| 162 case ET_KEY_RELEASED: | 163 case ET_KEY_RELEASED: |
| 163 action = "keyup:"; | 164 action = "keyup:"; |
| 164 break; | 165 break; |
| 165 default: | 166 default: |
| 166 break; | 167 break; |
| 167 } | 168 } |
| 168 std::stringstream ss; | 169 std::stringstream ss; |
| 169 ss << key_event.key_code(); | 170 ss << key_event->key_code(); |
| 170 action += std::string(ss.str()); | 171 action += std::string(ss.str()); |
| 171 TestResult::GetInstance()->RecordAction(base::ASCIIToUTF16(action)); | 172 TestResult::GetInstance()->RecordAction(base::ASCIIToUTF16(action)); |
| 172 return false; | 173 return ui::EventDispatchDetails(); |
| 173 } | 174 } |
| 174 | 175 |
| 175 private: | 176 private: |
| 176 DISALLOW_COPY_AND_ASSIGN(InputMethodDelegateForTesting); | 177 DISALLOW_COPY_AND_ASSIGN(InputMethodDelegateForTesting); |
| 177 }; | 178 }; |
| 178 | 179 |
| 179 class TextInputClientForTesting : public DummyTextInputClient { | 180 class TextInputClientForTesting : public DummyTextInputClient { |
| 180 public: | 181 public: |
| 181 explicit TextInputClientForTesting(TextInputType text_input_type) | 182 explicit TextInputClientForTesting(TextInputType text_input_type) |
| 182 : DummyTextInputClient(text_input_type){}; | 183 : DummyTextInputClient(text_input_type){}; |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 283 TEST_F(InputMethodAuraLinuxTest, BasicSyncModeTest) { | 284 TEST_F(InputMethodAuraLinuxTest, BasicSyncModeTest) { |
| 284 context_->SetSyncMode(true); | 285 context_->SetSyncMode(true); |
| 285 context_->SetEatKey(true); | 286 context_->SetEatKey(true); |
| 286 context_->AddCommitAction("a"); | 287 context_->AddCommitAction("a"); |
| 287 | 288 |
| 288 scoped_ptr<TextInputClientForTesting> client( | 289 scoped_ptr<TextInputClientForTesting> client( |
| 289 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 290 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 290 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 291 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 291 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 292 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 292 | 293 |
| 293 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 294 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 294 key.set_character(L'a'); | 295 key_new.set_character(L'a'); |
| 295 input_method_auralinux_->DispatchKeyEvent(key); | 296 |
| 297 KeyEvent key = key_new; |
| 298 input_method_auralinux_->DispatchKeyEvent(&key); |
| 296 | 299 |
| 297 test_result_->ExpectAction("keydown:65"); | 300 test_result_->ExpectAction("keydown:65"); |
| 298 test_result_->ExpectAction("keypress:97"); | 301 test_result_->ExpectAction("keypress:97"); |
| 299 test_result_->Verify(); | 302 test_result_->Verify(); |
| 300 | 303 |
| 301 input_method_auralinux_->DetachTextInputClient(client.get()); | 304 input_method_auralinux_->DetachTextInputClient(client.get()); |
| 302 client.reset(new TextInputClientForTesting(TEXT_INPUT_TYPE_PASSWORD)); | 305 client.reset(new TextInputClientForTesting(TEXT_INPUT_TYPE_PASSWORD)); |
| 303 context_simple_->SetSyncMode(true); | 306 context_simple_->SetSyncMode(true); |
| 304 context_simple_->SetEatKey(false); | 307 context_simple_->SetEatKey(false); |
| 305 | 308 |
| 306 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 309 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 307 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 310 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 308 input_method_auralinux_->DispatchKeyEvent(key); | 311 key = key_new; |
| 312 input_method_auralinux_->DispatchKeyEvent(&key); |
| 309 | 313 |
| 310 test_result_->ExpectAction("keydown:65"); | 314 test_result_->ExpectAction("keydown:65"); |
| 311 test_result_->ExpectAction("keypress:97"); | 315 test_result_->ExpectAction("keypress:97"); |
| 312 test_result_->Verify(); | 316 test_result_->Verify(); |
| 313 } | 317 } |
| 314 | 318 |
| 315 TEST_F(InputMethodAuraLinuxTest, BasicAsyncModeTest) { | 319 TEST_F(InputMethodAuraLinuxTest, BasicAsyncModeTest) { |
| 316 context_->SetSyncMode(false); | 320 context_->SetSyncMode(false); |
| 317 context_->SetEatKey(true); | 321 context_->SetEatKey(true); |
| 318 | 322 |
| 319 scoped_ptr<TextInputClientForTesting> client( | 323 scoped_ptr<TextInputClientForTesting> client( |
| 320 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 324 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 321 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 325 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 322 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 326 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 323 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 327 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 324 key.set_character(L'a'); | 328 key_new.set_character(L'a'); |
| 325 input_method_auralinux_->DispatchKeyEvent(key); | 329 KeyEvent key = key_new; |
| 330 input_method_auralinux_->DispatchKeyEvent(&key); |
| 326 input_method_auralinux_->OnCommit(base::ASCIIToUTF16("a")); | 331 input_method_auralinux_->OnCommit(base::ASCIIToUTF16("a")); |
| 327 | 332 |
| 328 test_result_->ExpectAction("keydown:229"); | 333 test_result_->ExpectAction("keydown:229"); |
| 329 test_result_->ExpectAction("textinput:a"); | 334 test_result_->ExpectAction("textinput:a"); |
| 330 test_result_->Verify(); | 335 test_result_->Verify(); |
| 331 | 336 |
| 332 input_method_auralinux_->DetachTextInputClient(client.get()); | 337 input_method_auralinux_->DetachTextInputClient(client.get()); |
| 333 client.reset(new TextInputClientForTesting(TEXT_INPUT_TYPE_PASSWORD)); | 338 client.reset(new TextInputClientForTesting(TEXT_INPUT_TYPE_PASSWORD)); |
| 334 context_simple_->SetSyncMode(false); | 339 context_simple_->SetSyncMode(false); |
| 335 context_simple_->SetEatKey(false); | 340 context_simple_->SetEatKey(false); |
| 336 | 341 |
| 337 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 342 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 338 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 343 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 339 input_method_auralinux_->DispatchKeyEvent(key); | 344 key = key_new; |
| 345 input_method_auralinux_->DispatchKeyEvent(&key); |
| 340 | 346 |
| 341 test_result_->ExpectAction("keydown:65"); | 347 test_result_->ExpectAction("keydown:65"); |
| 342 test_result_->ExpectAction("keypress:97"); | 348 test_result_->ExpectAction("keypress:97"); |
| 343 test_result_->Verify(); | 349 test_result_->Verify(); |
| 344 } | 350 } |
| 345 | 351 |
| 346 TEST_F(InputMethodAuraLinuxTest, IBusUSTest) { | 352 TEST_F(InputMethodAuraLinuxTest, IBusUSTest) { |
| 347 context_->SetSyncMode(false); | 353 context_->SetSyncMode(false); |
| 348 context_->SetEatKey(true); | 354 context_->SetEatKey(true); |
| 349 | 355 |
| 350 scoped_ptr<TextInputClientForTesting> client( | 356 scoped_ptr<TextInputClientForTesting> client( |
| 351 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 357 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 352 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 358 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 353 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 359 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 354 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 360 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 355 key.set_character(L'a'); | 361 key_new.set_character(L'a'); |
| 356 input_method_auralinux_->DispatchKeyEvent(key); | 362 KeyEvent key = key_new; |
| 363 input_method_auralinux_->DispatchKeyEvent(&key); |
| 357 | 364 |
| 358 // IBus mutes the key down. | 365 // IBus mutes the key down. |
| 359 test_result_->Verify(); | 366 test_result_->Verify(); |
| 360 | 367 |
| 361 // IBus simulates a faked key down and handle it in sync mode. | 368 // IBus simulates a faked key down and handle it in sync mode. |
| 362 context_->SetSyncMode(true); | 369 context_->SetSyncMode(true); |
| 363 context_->AddCommitAction("a"); | 370 context_->AddCommitAction("a"); |
| 364 input_method_auralinux_->DispatchKeyEvent(key); | 371 key = key_new; |
| 372 input_method_auralinux_->DispatchKeyEvent(&key); |
| 365 | 373 |
| 366 test_result_->ExpectAction("keydown:65"); | 374 test_result_->ExpectAction("keydown:65"); |
| 367 test_result_->ExpectAction("keypress:97"); | 375 test_result_->ExpectAction("keypress:97"); |
| 368 test_result_->Verify(); | 376 test_result_->Verify(); |
| 369 | 377 |
| 370 // IBus does NOT handle the key up. | 378 // IBus does NOT handle the key up. |
| 371 context_->SetEatKey(false); | 379 context_->SetEatKey(false); |
| 372 input_method_auralinux_->DispatchKeyEvent( | 380 KeyEvent key_up(ET_KEY_RELEASED, VKEY_A, 0); |
| 373 KeyEvent(ET_KEY_RELEASED, VKEY_A, 0)); | 381 input_method_auralinux_->DispatchKeyEvent(&key_up); |
| 374 | 382 |
| 375 test_result_->ExpectAction("keyup:65"); | 383 test_result_->ExpectAction("keyup:65"); |
| 376 test_result_->Verify(); | 384 test_result_->Verify(); |
| 377 } | 385 } |
| 378 | 386 |
| 379 TEST_F(InputMethodAuraLinuxTest, IBusPinyinTest) { | 387 TEST_F(InputMethodAuraLinuxTest, IBusPinyinTest) { |
| 380 context_->SetSyncMode(false); | 388 context_->SetSyncMode(false); |
| 381 context_->SetEatKey(true); | 389 context_->SetEatKey(true); |
| 382 | 390 |
| 383 scoped_ptr<TextInputClientForTesting> client( | 391 scoped_ptr<TextInputClientForTesting> client( |
| 384 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 392 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 385 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 393 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 386 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 394 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 387 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 395 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); |
| 388 key.set_character(L'a'); | 396 key.set_character(L'a'); |
| 389 input_method_auralinux_->DispatchKeyEvent(key); | 397 input_method_auralinux_->DispatchKeyEvent(&key); |
| 390 | 398 |
| 391 // IBus issues a standalone set_composition action. | 399 // IBus issues a standalone set_composition action. |
| 392 input_method_auralinux_->OnPreeditStart(); | 400 input_method_auralinux_->OnPreeditStart(); |
| 393 CompositionText comp; | 401 CompositionText comp; |
| 394 comp.text = base::ASCIIToUTF16("a"); | 402 comp.text = base::ASCIIToUTF16("a"); |
| 395 input_method_auralinux_->OnPreeditChanged(comp); | 403 input_method_auralinux_->OnPreeditChanged(comp); |
| 396 | 404 |
| 397 test_result_->ExpectAction("keydown:229"); | 405 test_result_->ExpectAction("keydown:229"); |
| 398 test_result_->ExpectAction("compositionstart"); | 406 test_result_->ExpectAction("compositionstart"); |
| 399 test_result_->ExpectAction("compositionupdate:a"); | 407 test_result_->ExpectAction("compositionupdate:a"); |
| 400 test_result_->Verify(); | 408 test_result_->Verify(); |
| 401 | 409 |
| 402 // IBus issues a commit text with composition after muting the space key down. | 410 // IBus issues a commit text with composition after muting the space key down. |
| 403 input_method_auralinux_->DispatchKeyEvent( | 411 KeyEvent key_up(ET_KEY_RELEASED, VKEY_SPACE, 0); |
| 404 KeyEvent(ET_KEY_PRESSED, VKEY_SPACE, 0)); | 412 input_method_auralinux_->DispatchKeyEvent(&key_up); |
| 405 | 413 |
| 406 input_method_auralinux_->OnPreeditEnd(); | 414 input_method_auralinux_->OnPreeditEnd(); |
| 407 input_method_auralinux_->OnCommit(base::ASCIIToUTF16("A")); | 415 input_method_auralinux_->OnCommit(base::ASCIIToUTF16("A")); |
| 408 | 416 |
| 409 test_result_->ExpectAction("keydown:229"); | 417 test_result_->ExpectAction("keydown:229"); |
| 410 test_result_->ExpectAction("compositionend"); | 418 test_result_->ExpectAction("compositionend"); |
| 411 test_result_->ExpectAction("keydown:229"); | 419 test_result_->ExpectAction("keydown:229"); |
| 412 test_result_->ExpectAction("textinput:A"); | 420 test_result_->ExpectAction("textinput:A"); |
| 413 test_result_->Verify(); | 421 test_result_->Verify(); |
| 414 } | 422 } |
| 415 | 423 |
| 416 // crbug.com/463491 | 424 // crbug.com/463491 |
| 417 TEST_F(InputMethodAuraLinuxTest, DeadKeyTest) { | 425 TEST_F(InputMethodAuraLinuxTest, DeadKeyTest) { |
| 418 context_simple_->SetSyncMode(true); | 426 context_simple_->SetSyncMode(true); |
| 419 context_simple_->SetEatKey(true); | 427 context_simple_->SetEatKey(true); |
| 420 | 428 |
| 421 scoped_ptr<TextInputClientForTesting> client( | 429 scoped_ptr<TextInputClientForTesting> client( |
| 422 new TextInputClientForTesting(TEXT_INPUT_TYPE_NONE)); | 430 new TextInputClientForTesting(TEXT_INPUT_TYPE_NONE)); |
| 423 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 431 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 424 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 432 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 425 | 433 |
| 426 KeyEvent dead_key(ET_KEY_PRESSED, VKEY_OEM_7, 0); | 434 KeyEvent dead_key(ET_KEY_PRESSED, VKEY_OEM_7, 0); |
| 427 dead_key.set_character(L'\''); | 435 dead_key.set_character(L'\''); |
| 428 input_method_auralinux_->DispatchKeyEvent(dead_key); | 436 input_method_auralinux_->DispatchKeyEvent(&dead_key); |
| 429 | 437 |
| 430 // The single quote key is muted. | 438 // The single quote key is muted. |
| 431 test_result_->ExpectAction("keydown:222"); | 439 test_result_->ExpectAction("keydown:222"); |
| 432 test_result_->Verify(); | 440 test_result_->Verify(); |
| 433 | 441 |
| 434 context_simple_->AddCommitAction("X"); | 442 context_simple_->AddCommitAction("X"); |
| 435 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 443 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); |
| 436 key.set_character(L'a'); | 444 key.set_character(L'a'); |
| 437 input_method_auralinux_->DispatchKeyEvent(key); | 445 input_method_auralinux_->DispatchKeyEvent(&key); |
| 438 | 446 |
| 439 // The following A key generates the accent key: á. | 447 // The following A key generates the accent key: á. |
| 440 test_result_->ExpectAction("keydown:65"); | 448 test_result_->ExpectAction("keydown:65"); |
| 441 test_result_->ExpectAction("keypress:88"); | 449 test_result_->ExpectAction("keypress:88"); |
| 442 test_result_->Verify(); | 450 test_result_->Verify(); |
| 443 } | 451 } |
| 444 | 452 |
| 445 TEST_F(InputMethodAuraLinuxTest, MultiCommitsTest) { | 453 TEST_F(InputMethodAuraLinuxTest, MultiCommitsTest) { |
| 446 context_->SetSyncMode(true); | 454 context_->SetSyncMode(true); |
| 447 context_->SetEatKey(true); | 455 context_->SetEatKey(true); |
| 448 context_->AddCommitAction("a"); | 456 context_->AddCommitAction("a"); |
| 449 context_->AddCommitAction("b"); | 457 context_->AddCommitAction("b"); |
| 450 context_->AddCommitAction("c"); | 458 context_->AddCommitAction("c"); |
| 451 | 459 |
| 452 scoped_ptr<TextInputClientForTesting> client( | 460 scoped_ptr<TextInputClientForTesting> client( |
| 453 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 461 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 454 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 462 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 455 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 463 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 456 | 464 |
| 457 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 465 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); |
| 458 key.set_character(L'a'); | 466 key.set_character(L'a'); |
| 459 input_method_auralinux_->DispatchKeyEvent(key); | 467 input_method_auralinux_->DispatchKeyEvent(&key); |
| 460 | 468 |
| 461 test_result_->ExpectAction("keydown:229"); | 469 test_result_->ExpectAction("keydown:229"); |
| 462 test_result_->ExpectAction("textinput:abc"); | 470 test_result_->ExpectAction("textinput:abc"); |
| 463 test_result_->Verify(); | 471 test_result_->Verify(); |
| 464 } | 472 } |
| 465 | 473 |
| 466 TEST_F(InputMethodAuraLinuxTest, MixedCompositionAndCommitTest) { | 474 TEST_F(InputMethodAuraLinuxTest, MixedCompositionAndCommitTest) { |
| 467 context_->SetSyncMode(true); | 475 context_->SetSyncMode(true); |
| 468 context_->SetEatKey(true); | 476 context_->SetEatKey(true); |
| 469 context_->AddCommitAction("a"); | 477 context_->AddCommitAction("a"); |
| 470 context_->AddCompositionStartAction(); | 478 context_->AddCompositionStartAction(); |
| 471 context_->AddCompositionUpdateAction("b"); | 479 context_->AddCompositionUpdateAction("b"); |
| 472 context_->AddCommitAction("c"); | 480 context_->AddCommitAction("c"); |
| 473 context_->AddCompositionUpdateAction("d"); | 481 context_->AddCompositionUpdateAction("d"); |
| 474 | 482 |
| 475 scoped_ptr<TextInputClientForTesting> client( | 483 scoped_ptr<TextInputClientForTesting> client( |
| 476 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 484 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 477 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 485 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 478 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 486 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 479 | 487 |
| 480 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 488 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 481 key.set_character(L'a'); | 489 key_new.set_character(L'a'); |
| 482 input_method_auralinux_->DispatchKeyEvent(key); | 490 KeyEvent key = key_new; |
| 491 input_method_auralinux_->DispatchKeyEvent(&key); |
| 483 | 492 |
| 484 test_result_->ExpectAction("keydown:229"); | 493 test_result_->ExpectAction("keydown:229"); |
| 485 test_result_->ExpectAction("textinput:ac"); | 494 test_result_->ExpectAction("textinput:ac"); |
| 486 test_result_->ExpectAction("compositionstart"); | 495 test_result_->ExpectAction("compositionstart"); |
| 487 test_result_->ExpectAction("compositionupdate:d"); | 496 test_result_->ExpectAction("compositionupdate:d"); |
| 488 test_result_->Verify(); | 497 test_result_->Verify(); |
| 489 | 498 |
| 490 context_->AddCommitAction("e"); | 499 context_->AddCommitAction("e"); |
| 491 input_method_auralinux_->DispatchKeyEvent(key); | 500 key = key_new; |
| 501 input_method_auralinux_->DispatchKeyEvent(&key); |
| 492 | 502 |
| 493 test_result_->ExpectAction("keydown:229"); | 503 test_result_->ExpectAction("keydown:229"); |
| 494 test_result_->ExpectAction("compositionend"); | 504 test_result_->ExpectAction("compositionend"); |
| 495 test_result_->ExpectAction("textinput:e"); | 505 test_result_->ExpectAction("textinput:e"); |
| 496 test_result_->Verify(); | 506 test_result_->Verify(); |
| 497 } | 507 } |
| 498 | 508 |
| 499 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithoutCommitTest) { | 509 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithoutCommitTest) { |
| 500 context_->SetSyncMode(true); | 510 context_->SetSyncMode(true); |
| 501 context_->SetEatKey(true); | 511 context_->SetEatKey(true); |
| 502 context_->AddCompositionStartAction(); | 512 context_->AddCompositionStartAction(); |
| 503 context_->AddCompositionUpdateAction("a"); | 513 context_->AddCompositionUpdateAction("a"); |
| 504 | 514 |
| 505 scoped_ptr<TextInputClientForTesting> client( | 515 scoped_ptr<TextInputClientForTesting> client( |
| 506 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 516 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 507 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 517 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 508 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 518 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 509 | 519 |
| 510 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 520 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 511 key.set_character(L'a'); | 521 key_new.set_character(L'a'); |
| 512 input_method_auralinux_->DispatchKeyEvent(key); | 522 KeyEvent key = key_new; |
| 523 input_method_auralinux_->DispatchKeyEvent(&key); |
| 513 | 524 |
| 514 test_result_->ExpectAction("keydown:229"); | 525 test_result_->ExpectAction("keydown:229"); |
| 515 test_result_->ExpectAction("compositionstart"); | 526 test_result_->ExpectAction("compositionstart"); |
| 516 test_result_->ExpectAction("compositionupdate:a"); | 527 test_result_->ExpectAction("compositionupdate:a"); |
| 517 test_result_->Verify(); | 528 test_result_->Verify(); |
| 518 | 529 |
| 519 context_->AddCompositionEndAction(); | 530 context_->AddCompositionEndAction(); |
| 520 input_method_auralinux_->DispatchKeyEvent(key); | 531 key = key_new; |
| 532 input_method_auralinux_->DispatchKeyEvent(&key); |
| 521 | 533 |
| 522 test_result_->ExpectAction("keydown:229"); | 534 test_result_->ExpectAction("keydown:229"); |
| 523 test_result_->ExpectAction("compositionend"); | 535 test_result_->ExpectAction("compositionend"); |
| 524 test_result_->Verify(); | 536 test_result_->Verify(); |
| 525 } | 537 } |
| 526 | 538 |
| 527 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithEmptyCommitTest) { | 539 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithEmptyCommitTest) { |
| 528 context_->SetSyncMode(true); | 540 context_->SetSyncMode(true); |
| 529 context_->SetEatKey(true); | 541 context_->SetEatKey(true); |
| 530 context_->AddCompositionStartAction(); | 542 context_->AddCompositionStartAction(); |
| 531 context_->AddCompositionUpdateAction("a"); | 543 context_->AddCompositionUpdateAction("a"); |
| 532 | 544 |
| 533 scoped_ptr<TextInputClientForTesting> client( | 545 scoped_ptr<TextInputClientForTesting> client( |
| 534 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 546 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 535 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 547 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 536 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 548 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 537 | 549 |
| 538 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 550 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 539 key.set_character(L'a'); | 551 key_new.set_character(L'a'); |
| 540 input_method_auralinux_->DispatchKeyEvent(key); | 552 KeyEvent key = key_new; |
| 553 input_method_auralinux_->DispatchKeyEvent(&key); |
| 541 | 554 |
| 542 test_result_->ExpectAction("keydown:229"); | 555 test_result_->ExpectAction("keydown:229"); |
| 543 test_result_->ExpectAction("compositionstart"); | 556 test_result_->ExpectAction("compositionstart"); |
| 544 test_result_->ExpectAction("compositionupdate:a"); | 557 test_result_->ExpectAction("compositionupdate:a"); |
| 545 test_result_->Verify(); | 558 test_result_->Verify(); |
| 546 | 559 |
| 547 context_->AddCompositionEndAction(); | 560 context_->AddCompositionEndAction(); |
| 548 context_->AddCommitAction(""); | 561 context_->AddCommitAction(""); |
| 549 input_method_auralinux_->DispatchKeyEvent(key); | 562 key = key_new; |
| 563 input_method_auralinux_->DispatchKeyEvent(&key); |
| 550 | 564 |
| 551 test_result_->ExpectAction("keydown:229"); | 565 test_result_->ExpectAction("keydown:229"); |
| 552 test_result_->ExpectAction("compositionend"); | 566 test_result_->ExpectAction("compositionend"); |
| 553 test_result_->Verify(); | 567 test_result_->Verify(); |
| 554 } | 568 } |
| 555 | 569 |
| 556 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithCommitTest) { | 570 TEST_F(InputMethodAuraLinuxTest, CompositionEndWithCommitTest) { |
| 557 context_->SetSyncMode(true); | 571 context_->SetSyncMode(true); |
| 558 context_->SetEatKey(true); | 572 context_->SetEatKey(true); |
| 559 context_->AddCompositionStartAction(); | 573 context_->AddCompositionStartAction(); |
| 560 context_->AddCompositionUpdateAction("a"); | 574 context_->AddCompositionUpdateAction("a"); |
| 561 | 575 |
| 562 scoped_ptr<TextInputClientForTesting> client( | 576 scoped_ptr<TextInputClientForTesting> client( |
| 563 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 577 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 564 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 578 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 565 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 579 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 566 | 580 |
| 567 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 581 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 568 key.set_character(L'a'); | 582 key_new.set_character(L'a'); |
| 569 input_method_auralinux_->DispatchKeyEvent(key); | 583 KeyEvent key = key_new; |
| 584 input_method_auralinux_->DispatchKeyEvent(&key); |
| 570 | 585 |
| 571 test_result_->ExpectAction("keydown:229"); | 586 test_result_->ExpectAction("keydown:229"); |
| 572 test_result_->ExpectAction("compositionstart"); | 587 test_result_->ExpectAction("compositionstart"); |
| 573 test_result_->ExpectAction("compositionupdate:a"); | 588 test_result_->ExpectAction("compositionupdate:a"); |
| 574 test_result_->Verify(); | 589 test_result_->Verify(); |
| 575 | 590 |
| 576 context_->AddCompositionEndAction(); | 591 context_->AddCompositionEndAction(); |
| 577 context_->AddCommitAction("b"); | 592 context_->AddCommitAction("b"); |
| 578 input_method_auralinux_->DispatchKeyEvent(key); | 593 key = key_new; |
| 594 input_method_auralinux_->DispatchKeyEvent(&key); |
| 579 | 595 |
| 580 // Verifies single char commit under composition mode will call InsertText | 596 // Verifies single char commit under composition mode will call InsertText |
| 581 // intead of InsertChar. | 597 // intead of InsertChar. |
| 582 test_result_->ExpectAction("keydown:229"); | 598 test_result_->ExpectAction("keydown:229"); |
| 583 test_result_->ExpectAction("compositionend"); | 599 test_result_->ExpectAction("compositionend"); |
| 584 test_result_->ExpectAction("textinput:b"); | 600 test_result_->ExpectAction("textinput:b"); |
| 585 test_result_->Verify(); | 601 test_result_->Verify(); |
| 586 } | 602 } |
| 587 | 603 |
| 588 TEST_F(InputMethodAuraLinuxTest, CompositionUpdateWithCommitTest) { | 604 TEST_F(InputMethodAuraLinuxTest, CompositionUpdateWithCommitTest) { |
| 589 context_->SetSyncMode(true); | 605 context_->SetSyncMode(true); |
| 590 context_->SetEatKey(true); | 606 context_->SetEatKey(true); |
| 591 context_->AddCompositionStartAction(); | 607 context_->AddCompositionStartAction(); |
| 592 context_->AddCompositionUpdateAction("a"); | 608 context_->AddCompositionUpdateAction("a"); |
| 593 context_->AddCommitAction("b"); | 609 context_->AddCommitAction("b"); |
| 594 | 610 |
| 595 scoped_ptr<TextInputClientForTesting> client( | 611 scoped_ptr<TextInputClientForTesting> client( |
| 596 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 612 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 597 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 613 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 598 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 614 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 599 | 615 |
| 600 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 616 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 601 key.set_character(L'a'); | 617 key_new.set_character(L'a'); |
| 602 input_method_auralinux_->DispatchKeyEvent(key); | 618 KeyEvent key = key_new; |
| 619 input_method_auralinux_->DispatchKeyEvent(&key); |
| 603 | 620 |
| 604 test_result_->ExpectAction("keydown:229"); | 621 test_result_->ExpectAction("keydown:229"); |
| 605 test_result_->ExpectAction("textinput:b"); | 622 test_result_->ExpectAction("textinput:b"); |
| 606 test_result_->ExpectAction("compositionstart"); | 623 test_result_->ExpectAction("compositionstart"); |
| 607 test_result_->ExpectAction("compositionupdate:a"); | 624 test_result_->ExpectAction("compositionupdate:a"); |
| 608 test_result_->Verify(); | 625 test_result_->Verify(); |
| 609 | 626 |
| 610 // crbug.com/513124. | 627 // crbug.com/513124. |
| 611 context_->SetSyncMode(true); | 628 context_->SetSyncMode(true); |
| 612 context_->SetEatKey(true); | 629 context_->SetEatKey(true); |
| 613 context_->AddCommitAction("c"); | 630 context_->AddCommitAction("c"); |
| 614 context_->AddCompositionUpdateAction(""); | 631 context_->AddCompositionUpdateAction(""); |
| 615 input_method_auralinux_->DispatchKeyEvent(key); | 632 key = key_new; |
| 633 input_method_auralinux_->DispatchKeyEvent(&key); |
| 616 | 634 |
| 617 test_result_->ExpectAction("keydown:229"); | 635 test_result_->ExpectAction("keydown:229"); |
| 618 test_result_->ExpectAction("compositionend"); | 636 test_result_->ExpectAction("compositionend"); |
| 619 test_result_->ExpectAction("textinput:c"); | 637 test_result_->ExpectAction("textinput:c"); |
| 620 test_result_->Verify(); | 638 test_result_->Verify(); |
| 621 } | 639 } |
| 622 | 640 |
| 623 TEST_F(InputMethodAuraLinuxTest, MixedAsyncAndSyncTest) { | 641 TEST_F(InputMethodAuraLinuxTest, MixedAsyncAndSyncTest) { |
| 624 context_->SetSyncMode(false); | 642 context_->SetSyncMode(false); |
| 625 context_->SetEatKey(true); | 643 context_->SetEatKey(true); |
| 626 | 644 |
| 627 scoped_ptr<TextInputClientForTesting> client( | 645 scoped_ptr<TextInputClientForTesting> client( |
| 628 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 646 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 629 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 647 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 630 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 648 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 631 | 649 |
| 632 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 650 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 633 key.set_character(L'a'); | 651 key_new.set_character(L'a'); |
| 634 input_method_auralinux_->DispatchKeyEvent(key); | 652 KeyEvent key = key_new; |
| 653 input_method_auralinux_->DispatchKeyEvent(&key); |
| 635 CompositionText comp; | 654 CompositionText comp; |
| 636 comp.text = base::ASCIIToUTF16("a"); | 655 comp.text = base::ASCIIToUTF16("a"); |
| 637 input_method_auralinux_->OnPreeditChanged(comp); | 656 input_method_auralinux_->OnPreeditChanged(comp); |
| 638 | 657 |
| 639 test_result_->ExpectAction("keydown:229"); | 658 test_result_->ExpectAction("keydown:229"); |
| 640 test_result_->ExpectAction("compositionstart"); | 659 test_result_->ExpectAction("compositionstart"); |
| 641 test_result_->ExpectAction("compositionupdate:a"); | 660 test_result_->ExpectAction("compositionupdate:a"); |
| 642 test_result_->Verify(); | 661 test_result_->Verify(); |
| 643 | 662 |
| 644 context_->SetSyncMode(true); | 663 context_->SetSyncMode(true); |
| 645 context_->AddCompositionEndAction(); | 664 context_->AddCompositionEndAction(); |
| 646 context_->AddCommitAction("b"); | 665 context_->AddCommitAction("b"); |
| 647 | 666 |
| 648 input_method_auralinux_->DispatchKeyEvent(key); | 667 key = key_new; |
| 668 input_method_auralinux_->DispatchKeyEvent(&key); |
| 649 | 669 |
| 650 test_result_->ExpectAction("keydown:229"); | 670 test_result_->ExpectAction("keydown:229"); |
| 651 test_result_->ExpectAction("compositionend"); | 671 test_result_->ExpectAction("compositionend"); |
| 652 test_result_->ExpectAction("textinput:b"); | 672 test_result_->ExpectAction("textinput:b"); |
| 653 test_result_->Verify(); | 673 test_result_->Verify(); |
| 654 } | 674 } |
| 655 | 675 |
| 656 TEST_F(InputMethodAuraLinuxTest, MixedSyncAndAsyncTest) { | 676 TEST_F(InputMethodAuraLinuxTest, MixedSyncAndAsyncTest) { |
| 657 context_->SetSyncMode(true); | 677 context_->SetSyncMode(true); |
| 658 context_->SetEatKey(true); | 678 context_->SetEatKey(true); |
| 659 context_->AddCompositionStartAction(); | 679 context_->AddCompositionStartAction(); |
| 660 context_->AddCompositionUpdateAction("a"); | 680 context_->AddCompositionUpdateAction("a"); |
| 661 | 681 |
| 662 scoped_ptr<TextInputClientForTesting> client( | 682 scoped_ptr<TextInputClientForTesting> client( |
| 663 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 683 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 664 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 684 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 665 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 685 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 666 | 686 |
| 667 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 687 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 668 key.set_character(L'a'); | 688 key_new.set_character(L'a'); |
| 669 input_method_auralinux_->DispatchKeyEvent(key); | 689 KeyEvent key = key_new; |
| 690 input_method_auralinux_->DispatchKeyEvent(&key); |
| 670 | 691 |
| 671 test_result_->ExpectAction("keydown:229"); | 692 test_result_->ExpectAction("keydown:229"); |
| 672 test_result_->ExpectAction("compositionstart"); | 693 test_result_->ExpectAction("compositionstart"); |
| 673 test_result_->ExpectAction("compositionupdate:a"); | 694 test_result_->ExpectAction("compositionupdate:a"); |
| 674 test_result_->Verify(); | 695 test_result_->Verify(); |
| 675 | 696 |
| 676 context_->SetSyncMode(false); | 697 context_->SetSyncMode(false); |
| 677 | 698 |
| 678 input_method_auralinux_->DispatchKeyEvent(key); | 699 key = key_new; |
| 700 input_method_auralinux_->DispatchKeyEvent(&key); |
| 679 input_method_auralinux_->OnCommit(base::ASCIIToUTF16("b")); | 701 input_method_auralinux_->OnCommit(base::ASCIIToUTF16("b")); |
| 680 | 702 |
| 681 test_result_->ExpectAction("keydown:229"); | 703 test_result_->ExpectAction("keydown:229"); |
| 682 test_result_->ExpectAction("compositionend"); | 704 test_result_->ExpectAction("compositionend"); |
| 683 test_result_->ExpectAction("textinput:b"); | 705 test_result_->ExpectAction("textinput:b"); |
| 684 test_result_->Verify(); | 706 test_result_->Verify(); |
| 685 | 707 |
| 686 context_->SetSyncMode(true); | 708 context_->SetSyncMode(true); |
| 687 context_->AddCommitAction("c"); | 709 context_->AddCommitAction("c"); |
| 688 input_method_auralinux_->DispatchKeyEvent(key); | 710 key = key_new; |
| 711 input_method_auralinux_->DispatchKeyEvent(&key); |
| 689 | 712 |
| 690 test_result_->ExpectAction("keydown:65"); | 713 test_result_->ExpectAction("keydown:65"); |
| 691 test_result_->ExpectAction("keypress:99"); | 714 test_result_->ExpectAction("keypress:99"); |
| 692 test_result_->Verify(); | 715 test_result_->Verify(); |
| 693 } | 716 } |
| 694 | 717 |
| 695 TEST_F(InputMethodAuraLinuxTest, ReleaseKeyTest) { | 718 TEST_F(InputMethodAuraLinuxTest, ReleaseKeyTest) { |
| 696 context_->SetSyncMode(true); | 719 context_->SetSyncMode(true); |
| 697 context_->SetEatKey(true); | 720 context_->SetEatKey(true); |
| 698 context_->AddCompositionUpdateAction("a"); | 721 context_->AddCompositionUpdateAction("a"); |
| 699 | 722 |
| 700 scoped_ptr<TextInputClientForTesting> client( | 723 scoped_ptr<TextInputClientForTesting> client( |
| 701 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); | 724 new TextInputClientForTesting(TEXT_INPUT_TYPE_TEXT)); |
| 702 input_method_auralinux_->SetFocusedTextInputClient(client.get()); | 725 input_method_auralinux_->SetFocusedTextInputClient(client.get()); |
| 703 input_method_auralinux_->OnTextInputTypeChanged(client.get()); | 726 input_method_auralinux_->OnTextInputTypeChanged(client.get()); |
| 704 | 727 |
| 705 KeyEvent key(ET_KEY_PRESSED, VKEY_A, 0); | 728 KeyEvent key_new(ET_KEY_PRESSED, VKEY_A, 0); |
| 706 key.set_character(L'A'); | 729 key_new.set_character(L'A'); |
| 707 input_method_auralinux_->DispatchKeyEvent(key); | 730 KeyEvent key = key_new; |
| 731 input_method_auralinux_->DispatchKeyEvent(&key); |
| 708 | 732 |
| 709 test_result_->ExpectAction("keydown:229"); | 733 test_result_->ExpectAction("keydown:229"); |
| 710 test_result_->ExpectAction("compositionstart"); | 734 test_result_->ExpectAction("compositionstart"); |
| 711 test_result_->ExpectAction("compositionupdate:a"); | 735 test_result_->ExpectAction("compositionupdate:a"); |
| 712 test_result_->Verify(); | 736 test_result_->Verify(); |
| 713 | 737 |
| 714 context_->SetEatKey(false); | 738 context_->SetEatKey(false); |
| 715 context_->AddCommitAction("b"); | 739 context_->AddCommitAction("b"); |
| 716 input_method_auralinux_->DispatchKeyEvent(key); | 740 key = key_new; |
| 741 input_method_auralinux_->DispatchKeyEvent(&key); |
| 717 | 742 |
| 718 test_result_->ExpectAction("compositionend"); | 743 test_result_->ExpectAction("compositionend"); |
| 719 test_result_->ExpectAction("textinput:b"); | 744 test_result_->ExpectAction("textinput:b"); |
| 720 test_result_->ExpectAction("keydown:65"); | 745 test_result_->ExpectAction("keydown:65"); |
| 721 test_result_->ExpectAction("keypress:65"); | 746 test_result_->ExpectAction("keypress:65"); |
| 722 test_result_->Verify(); | 747 test_result_->Verify(); |
| 723 | 748 |
| 724 context_->AddCommitAction("c"); | 749 context_->AddCommitAction("c"); |
| 725 input_method_auralinux_->DispatchKeyEvent(key); | 750 key = key_new; |
| 751 input_method_auralinux_->DispatchKeyEvent(&key); |
| 726 | 752 |
| 727 test_result_->ExpectAction("textinput:c"); | 753 test_result_->ExpectAction("textinput:c"); |
| 728 test_result_->ExpectAction("keydown:65"); | 754 test_result_->ExpectAction("keydown:65"); |
| 729 test_result_->ExpectAction("keypress:65"); | 755 test_result_->ExpectAction("keypress:65"); |
| 730 test_result_->Verify(); | 756 test_result_->Verify(); |
| 731 } | 757 } |
| 732 | 758 |
| 733 } // namespace | 759 } // namespace |
| 734 } // namespace ui | 760 } // namespace ui |
| OLD | NEW |