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

Side by Side Diff: ui/base/ime/chromeos/character_composer_unittest.cc

Issue 111373008: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 | Annotate | Revision Log
« no previous file with comments | « ui/base/clipboard/clipboard_win.cc ('k') | ui/base/ime/dummy_text_input_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "ui/base/ime/chromeos/character_composer.h" 5 #include "ui/base/ime/chromeos/character_composer.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "third_party/gtk+/gdk/gdkkeysyms.h" 9 #include "third_party/gtk+/gdk/gdkkeysyms.h"
10 #include "ui/base/glib/glib_integers.h" 10 #include "ui/base/glib/glib_integers.h"
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 279
280 TEST_F(CharacterComposerTest, HexadecimalComposition) { 280 TEST_F(CharacterComposerTest, HexadecimalComposition) {
281 CharacterComposer character_composer; 281 CharacterComposer character_composer;
282 // HIRAGANA LETTER A (U+3042) 282 // HIRAGANA LETTER A (U+3042)
283 ExpectKeyFiltered(&character_composer, GDK_KEY_U, 283 ExpectKeyFiltered(&character_composer, GDK_KEY_U,
284 EF_SHIFT_DOWN | EF_CONTROL_DOWN); 284 EF_SHIFT_DOWN | EF_CONTROL_DOWN);
285 ExpectCharacterComposed(&character_composer, GDK_KEY_3, GDK_KEY_0, GDK_KEY_4, 285 ExpectCharacterComposed(&character_composer, GDK_KEY_3, GDK_KEY_0, GDK_KEY_4,
286 GDK_KEY_2, GDK_KEY_space, 0, 286 GDK_KEY_2, GDK_KEY_space, 0,
287 base::string16(1, 0x3042)); 287 base::string16(1, 0x3042));
288 // MUSICAL KEYBOARD (U+1F3B9) 288 // MUSICAL KEYBOARD (U+1F3B9)
289 const char16 kMusicalKeyboard[] = {0xd83c, 0xdfb9}; 289 const base::char16 kMusicalKeyboard[] = {0xd83c, 0xdfb9};
290 ExpectKeyFiltered(&character_composer, GDK_KEY_U, 290 ExpectKeyFiltered(&character_composer, GDK_KEY_U,
291 EF_SHIFT_DOWN | EF_CONTROL_DOWN); 291 EF_SHIFT_DOWN | EF_CONTROL_DOWN);
292 ExpectCharacterComposed(&character_composer, GDK_KEY_1, GDK_KEY_f, GDK_KEY_3, 292 ExpectCharacterComposed(&character_composer, GDK_KEY_1, GDK_KEY_f, GDK_KEY_3,
293 GDK_KEY_b, GDK_KEY_9, GDK_KEY_Return, 0, 293 GDK_KEY_b, GDK_KEY_9, GDK_KEY_Return, 0,
294 base::string16(kMusicalKeyboard, 294 base::string16(kMusicalKeyboard,
295 kMusicalKeyboard + 295 kMusicalKeyboard +
296 arraysize(kMusicalKeyboard))); 296 arraysize(kMusicalKeyboard)));
297 } 297 }
298 298
299 TEST_F(CharacterComposerTest, HexadecimalCompositionPreedit) { 299 TEST_F(CharacterComposerTest, HexadecimalCompositionPreedit) {
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 530
531 TEST_F(CharacterComposerTest, BlacklistedKeyeventsTest) { 531 TEST_F(CharacterComposerTest, BlacklistedKeyeventsTest) {
532 CharacterComposer character_composer; 532 CharacterComposer character_composer;
533 EXPECT_TRUE(FilterKeyPress(&character_composer, GDK_KEY_dead_acute, 0, 0)); 533 EXPECT_TRUE(FilterKeyPress(&character_composer, GDK_KEY_dead_acute, 0, 0));
534 EXPECT_FALSE(FilterKeyPress(&character_composer, GDK_KEY_s, 0, 0)); 534 EXPECT_FALSE(FilterKeyPress(&character_composer, GDK_KEY_s, 0, 0));
535 ASSERT_EQ(1U, character_composer.composed_character().size()); 535 ASSERT_EQ(1U, character_composer.composed_character().size());
536 EXPECT_EQ(GDK_KEY_apostrophe, character_composer.composed_character().at(0)); 536 EXPECT_EQ(GDK_KEY_apostrophe, character_composer.composed_character().at(0));
537 } 537 }
538 538
539 } // namespace ui 539 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/clipboard/clipboard_win.cc ('k') | ui/base/ime/dummy_text_input_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698