Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_engine_browsertests.cc

Issue 324903002: Remoes X11 dependency in InputMethodEngine. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "ash/ime/input_method_menu_item.h" 5 #include "ash/ime/input_method_menu_item.h"
6 #include "ash/ime/input_method_menu_manager.h" 6 #include "ash/ime/input_method_menu_manager.h"
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
10 #include "chrome/browser/extensions/extension_test_message_listener.h" 10 #include "chrome/browser/extensions/extension_test_message_listener.h"
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 base::Bind(&KeyEventDoneCallback::Run, 329 base::Bind(&KeyEventDoneCallback::Run,
330 base::Unretained(&callback))); 330 base::Unretained(&callback)));
331 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); 331 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());
332 EXPECT_TRUE(keyevent_listener.was_satisfied()); 332 EXPECT_TRUE(keyevent_listener.was_satisfied());
333 callback.WaitUntilCalled(); 333 callback.WaitUntilCalled();
334 } 334 }
335 { 335 {
336 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:No, Caps:Yes"); 336 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:No, Caps:Yes");
337 KeyEventDoneCallback callback(false); 337 KeyEventDoneCallback callback(false);
338 const std::string expected_value = 338 const std::string expected_value =
339 "onKeyEvent::keydown:a:KeyA:false:false:false:true"; 339 "onKeyEvent::keydown:A:KeyA:false:false:false:true";
340 ExtensionTestMessageListener keyevent_listener(expected_value, false); 340 ExtensionTestMessageListener keyevent_listener(expected_value, false);
341 341
342 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, 342 ui::KeyEvent key_event(ui::ET_KEY_PRESSED,
343 ui::VKEY_A, 343 ui::VKEY_A,
344 "KeyA", 344 "KeyA",
345 ui::EF_CAPS_LOCK_DOWN, 345 ui::EF_CAPS_LOCK_DOWN,
346 false); 346 false);
347 engine_handler->ProcessKeyEvent(key_event, 347 engine_handler->ProcessKeyEvent(key_event,
348 base::Bind(&KeyEventDoneCallback::Run, 348 base::Bind(&KeyEventDoneCallback::Run,
349 base::Unretained(&callback))); 349 base::Unretained(&callback)));
(...skipping 17 matching lines...) Expand all
367 base::Bind(&KeyEventDoneCallback::Run, 367 base::Bind(&KeyEventDoneCallback::Run,
368 base::Unretained(&callback))); 368 base::Unretained(&callback)));
369 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); 369 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());
370 EXPECT_TRUE(keyevent_listener.was_satisfied()); 370 EXPECT_TRUE(keyevent_listener.was_satisfied());
371 callback.WaitUntilCalled(); 371 callback.WaitUntilCalled();
372 } 372 }
373 { 373 {
374 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:Yes"); 374 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:Yes");
375 KeyEventDoneCallback callback(false); 375 KeyEventDoneCallback callback(false);
376 const std::string expected_value = 376 const std::string expected_value =
377 "onKeyEvent::keydown:A:KeyA:false:false:true:true"; 377 "onKeyEvent::keydown:a:KeyA:false:false:true:true";
378 ExtensionTestMessageListener keyevent_listener(expected_value, false); 378 ExtensionTestMessageListener keyevent_listener(expected_value, false);
379 379
380 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, 380 ui::KeyEvent key_event(ui::ET_KEY_PRESSED,
381 ui::VKEY_A, 381 ui::VKEY_A,
382 "KeyA", 382 "KeyA",
383 ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN, 383 ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN,
384 false); 384 false);
385 engine_handler->ProcessKeyEvent(key_event, 385 engine_handler->ProcessKeyEvent(key_event,
386 base::Bind(&KeyEventDoneCallback::Run, 386 base::Bind(&KeyEventDoneCallback::Run,
387 base::Unretained(&callback))); 387 base::Unretained(&callback)));
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
899 } 899 }
900 } 900 }
901 901
902 IMEBridge::Get()->SetInputContextHandler(NULL); 902 IMEBridge::Get()->SetInputContextHandler(NULL);
903 IMEBridge::Get()->SetCandidateWindowHandler(NULL); 903 IMEBridge::Get()->SetCandidateWindowHandler(NULL);
904 } 904 }
905 905
906 } // namespace 906 } // namespace
907 } // namespace input_method 907 } // namespace input_method
908 } // namespace chromeos 908 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine.cc ('k') | ui/base/ime/chromeos/character_composer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698