| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/character_composer.h" | 5 #include "ui/base/ime/chromeos/character_composer.h" |
| 6 | 6 |
| 7 #include <X11/Xlib.h> | 7 #include <X11/Xlib.h> |
| 8 #include <X11/Xutil.h> | 8 #include <X11/Xutil.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| 11 #include <iterator> | 11 #include <iterator> |
| 12 | 12 |
| 13 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
| 14 #include "base/third_party/icu/icu_utf.h" | 14 #include "base/third_party/icu/icu_utf.h" |
| 15 // Note for Gtk removal: gdkkeysyms.h only contains a set of | 15 // Note for Gtk removal: gdkkeysyms.h only contains a set of |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 558 std::string preedit_string_ascii("u"); | 558 std::string preedit_string_ascii("u"); |
| 559 for (size_t i = 0; i != compose_buffer_.size(); ++i) { | 559 for (size_t i = 0; i != compose_buffer_.size(); ++i) { |
| 560 const int digit = compose_buffer_[i]; | 560 const int digit = compose_buffer_[i]; |
| 561 DCHECK(0 <= digit && digit < 16); | 561 DCHECK(0 <= digit && digit < 16); |
| 562 preedit_string_ascii += digit <= 9 ? ('0' + digit) : ('a' + (digit - 10)); | 562 preedit_string_ascii += digit <= 9 ? ('0' + digit) : ('a' + (digit - 10)); |
| 563 } | 563 } |
| 564 preedit_string_ = ASCIIToUTF16(preedit_string_ascii); | 564 preedit_string_ = ASCIIToUTF16(preedit_string_ascii); |
| 565 } | 565 } |
| 566 | 566 |
| 567 } // namespace ui | 567 } // namespace ui |
| OLD | NEW |