| Index: ui/platform_window/mojo/ime_type_converters.cc
|
| diff --git a/ui/platform_window/mojo/ime_type_converters.cc b/ui/platform_window/mojo/ime_type_converters.cc
|
| index 6ee086d13a7686a2c5d8419abaabde41c20ca20a..2edc9bb92c1baef0f2296d02fa1aa0b11c8c0bc4 100644
|
| --- a/ui/platform_window/mojo/ime_type_converters.cc
|
| +++ b/ui/platform_window/mojo/ime_type_converters.cc
|
| @@ -62,14 +62,11 @@ ui::TextInputType TypeConverter<ui::TextInputType, TextInputType>::Convert(
|
| ui::TextInputState
|
| TypeConverter<ui::TextInputState, TextInputStatePtr>::Convert(
|
| const TextInputStatePtr& input) {
|
| - return ui::TextInputState(ConvertTo<ui::TextInputType>(input->type),
|
| - input->flags,
|
| - input->text.To<std::string>(),
|
| - input->selection_start,
|
| - input->selection_end,
|
| - input->composition_start,
|
| - input->composition_end,
|
| - input->can_compose_inline);
|
| + return ui::TextInputState(
|
| + ConvertTo<ui::TextInputType>(input->type), input->flags,
|
| + input->text.has_value() ? input->text.value() : std::string(),
|
| + input->selection_start, input->selection_end, input->composition_start,
|
| + input->composition_end, input->can_compose_inline);
|
| }
|
|
|
| } // namespace mojo
|
|
|