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

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

Issue 1559163002: Clean up event flags a bit: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 4 years, 11 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 <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 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
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, ui::VKEY_A, ui::DomCode::US_A,
344 ui::VKEY_A, 344 ui::EF_CAPS_LOCK_ON);
345 ui::DomCode::US_A,
346 ui::EF_CAPS_LOCK_DOWN);
347 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = 345 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =
348 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); 346 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));
349 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); 347 engine_handler->ProcessKeyEvent(key_event, keyevent_callback);
350 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); 348 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());
351 EXPECT_TRUE(keyevent_listener.was_satisfied()); 349 EXPECT_TRUE(keyevent_listener.was_satisfied());
352 callback.WaitUntilCalled(); 350 callback.WaitUntilCalled();
353 } 351 }
354 { 352 {
355 SCOPED_TRACE("KeyDown, Ctrl:Yes, alt:Yes, Shift:No, Caps:No"); 353 SCOPED_TRACE("KeyDown, Ctrl:Yes, alt:Yes, Shift:No, Caps:No");
356 KeyEventDoneCallback callback(false); 354 KeyEventDoneCallback callback(false);
(...skipping 12 matching lines...) Expand all
369 EXPECT_TRUE(keyevent_listener.was_satisfied()); 367 EXPECT_TRUE(keyevent_listener.was_satisfied());
370 callback.WaitUntilCalled(); 368 callback.WaitUntilCalled();
371 } 369 }
372 { 370 {
373 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:Yes"); 371 SCOPED_TRACE("KeyDown, Ctrl:No, alt:No, Shift:Yes, Caps:Yes");
374 KeyEventDoneCallback callback(false); 372 KeyEventDoneCallback callback(false);
375 const std::string expected_value = 373 const std::string expected_value =
376 "onKeyEvent::keydown:a:KeyA:false:false:true:true"; 374 "onKeyEvent::keydown:a:KeyA:false:false:true:true";
377 ExtensionTestMessageListener keyevent_listener(expected_value, false); 375 ExtensionTestMessageListener keyevent_listener(expected_value, false);
378 376
379 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, 377 ui::KeyEvent key_event(ui::ET_KEY_PRESSED, ui::VKEY_A, ui::DomCode::US_A,
380 ui::VKEY_A, 378 ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_ON);
381 ui::DomCode::US_A,
382 ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN);
383 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback = 379 ui::IMEEngineHandlerInterface::KeyEventDoneCallback keyevent_callback =
384 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback)); 380 base::Bind(&KeyEventDoneCallback::Run, base::Unretained(&callback));
385 engine_handler->ProcessKeyEvent(key_event, keyevent_callback); 381 engine_handler->ProcessKeyEvent(key_event, keyevent_callback);
386 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied()); 382 ASSERT_TRUE(keyevent_listener.WaitUntilSatisfied());
387 EXPECT_TRUE(keyevent_listener.was_satisfied()); 383 EXPECT_TRUE(keyevent_listener.was_satisfied());
388 callback.WaitUntilCalled(); 384 callback.WaitUntilCalled();
389 } 385 }
390 // Media keys cases. 386 // Media keys cases.
391 const struct { 387 const struct {
392 ui::KeyboardCode keycode; 388 ui::KeyboardCode keycode;
(...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after
1045 EXPECT_EQ("", mock_input_context->last_commit_text()); 1041 EXPECT_EQ("", mock_input_context->last_commit_text());
1046 } 1042 }
1047 1043
1048 ui::IMEBridge::Get()->SetInputContextHandler(NULL); 1044 ui::IMEBridge::Get()->SetInputContextHandler(NULL);
1049 ui::IMEBridge::Get()->SetCandidateWindowHandler(NULL); 1045 ui::IMEBridge::Get()->SetCandidateWindowHandler(NULL);
1050 } 1046 }
1051 1047
1052 } // namespace 1048 } // namespace
1053 } // namespace input_method 1049 } // namespace input_method
1054 } // namespace chromeos 1050 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/input_method/input_method_engine.cc ('k') | chrome/browser/ui/libgtk2ui/gtk2_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698