| Index: components/arc/ime/arc_ime_bridge_impl.cc
|
| diff --git a/components/arc/ime/arc_ime_bridge_impl.cc b/components/arc/ime/arc_ime_bridge_impl.cc
|
| index 125793e249719be5520baff4e8d93180a3bd65a9..b1a9407ee428507f6113560bae13e3bc21e58993 100644
|
| --- a/components/arc/ime/arc_ime_bridge_impl.cc
|
| +++ b/components/arc/ime/arc_ime_bridge_impl.cc
|
| @@ -14,49 +14,51 @@
|
| namespace arc {
|
| namespace {
|
|
|
| -ui::TextInputType ConvertTextInputType(arc::TextInputType ipc_type) {
|
| +ui::TextInputType ConvertTextInputType(arc::mojom::TextInputType ipc_type) {
|
| // The two enum types are similar, but intentionally made not identical.
|
| // We cannot force them to be in sync. If we do, updates in ui::TextInputType
|
| - // must always be propagated to the arc::TextInputType mojo definition in
|
| + // must always be propagated to the arc::mojom::TextInputType mojo definition
|
| + // in
|
| // ARC container side, which is in a different repository than Chromium.
|
| // We don't want such dependency.
|
| //
|
| // That's why we need a lengthy switch statement instead of static_cast
|
| // guarded by a static assert on the two enums to be in sync.
|
| switch (ipc_type) {
|
| - case arc::TextInputType::NONE:
|
| - return ui::TEXT_INPUT_TYPE_NONE;
|
| - case arc::TextInputType::TEXT:
|
| - return ui::TEXT_INPUT_TYPE_TEXT;
|
| - case arc::TextInputType::PASSWORD:
|
| - return ui::TEXT_INPUT_TYPE_PASSWORD;
|
| - case arc::TextInputType::SEARCH:
|
| - return ui::TEXT_INPUT_TYPE_SEARCH;
|
| - case arc::TextInputType::EMAIL:
|
| - return ui::TEXT_INPUT_TYPE_EMAIL;
|
| - case arc::TextInputType::NUMBER:
|
| - return ui::TEXT_INPUT_TYPE_NUMBER;
|
| - case arc::TextInputType::TELEPHONE:
|
| - return ui::TEXT_INPUT_TYPE_TELEPHONE;
|
| - case arc::TextInputType::URL:
|
| - return ui::TEXT_INPUT_TYPE_URL;
|
| - case arc::TextInputType::DATE:
|
| - return ui::TEXT_INPUT_TYPE_DATE;
|
| - case arc::TextInputType::TIME:
|
| - return ui::TEXT_INPUT_TYPE_TIME;
|
| - case arc::TextInputType::DATETIME:
|
| - return ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL;
|
| - default:
|
| - return ui::TEXT_INPUT_TYPE_TEXT;
|
| + case arc::mojom::TextInputType::NONE:
|
| + return ui::TEXT_INPUT_TYPE_NONE;
|
| + case arc::mojom::TextInputType::TEXT:
|
| + return ui::TEXT_INPUT_TYPE_TEXT;
|
| + case arc::mojom::TextInputType::PASSWORD:
|
| + return ui::TEXT_INPUT_TYPE_PASSWORD;
|
| + case arc::mojom::TextInputType::SEARCH:
|
| + return ui::TEXT_INPUT_TYPE_SEARCH;
|
| + case arc::mojom::TextInputType::EMAIL:
|
| + return ui::TEXT_INPUT_TYPE_EMAIL;
|
| + case arc::mojom::TextInputType::NUMBER:
|
| + return ui::TEXT_INPUT_TYPE_NUMBER;
|
| + case arc::mojom::TextInputType::TELEPHONE:
|
| + return ui::TEXT_INPUT_TYPE_TELEPHONE;
|
| + case arc::mojom::TextInputType::URL:
|
| + return ui::TEXT_INPUT_TYPE_URL;
|
| + case arc::mojom::TextInputType::DATE:
|
| + return ui::TEXT_INPUT_TYPE_DATE;
|
| + case arc::mojom::TextInputType::TIME:
|
| + return ui::TEXT_INPUT_TYPE_TIME;
|
| + case arc::mojom::TextInputType::DATETIME:
|
| + return ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL;
|
| + default:
|
| + return ui::TEXT_INPUT_TYPE_TEXT;
|
| }
|
| }
|
|
|
| -mojo::Array<arc::CompositionSegmentPtr> ConvertSegments(
|
| +mojo::Array<arc::mojom::CompositionSegmentPtr> ConvertSegments(
|
| const ui::CompositionText& composition) {
|
| - mojo::Array<arc::CompositionSegmentPtr> segments =
|
| - mojo::Array<arc::CompositionSegmentPtr>::New(0);
|
| + mojo::Array<arc::mojom::CompositionSegmentPtr> segments =
|
| + mojo::Array<arc::mojom::CompositionSegmentPtr>::New(0);
|
| for (const ui::CompositionUnderline& underline : composition.underlines) {
|
| - arc::CompositionSegmentPtr segment = arc::CompositionSegment::New();
|
| + arc::mojom::CompositionSegmentPtr segment =
|
| + arc::mojom::CompositionSegment::New();
|
| segment->start_offset = underline.start_offset;
|
| segment->end_offset = underline.end_offset;
|
| segment->emphasized = (underline.thick ||
|
| @@ -85,7 +87,7 @@ void ArcImeBridgeImpl::OnImeInstanceReady() {
|
|
|
| void ArcImeBridgeImpl::SendSetCompositionText(
|
| const ui::CompositionText& composition) {
|
| - ImeInstance* ime_instance = bridge_service_->ime_instance();
|
| + mojom::ImeInstance* ime_instance = bridge_service_->ime_instance();
|
| if (!ime_instance) {
|
| LOG(ERROR) << "ArcImeInstance method called before being ready.";
|
| return;
|
| @@ -96,7 +98,7 @@ void ArcImeBridgeImpl::SendSetCompositionText(
|
| }
|
|
|
| void ArcImeBridgeImpl::SendConfirmCompositionText() {
|
| - ImeInstance* ime_instance = bridge_service_->ime_instance();
|
| + mojom::ImeInstance* ime_instance = bridge_service_->ime_instance();
|
| if (!ime_instance) {
|
| LOG(ERROR) << "ArcImeInstance method called before being ready.";
|
| return;
|
| @@ -106,7 +108,7 @@ void ArcImeBridgeImpl::SendConfirmCompositionText() {
|
| }
|
|
|
| void ArcImeBridgeImpl::SendInsertText(const base::string16& text) {
|
| - ImeInstance* ime_instance = bridge_service_->ime_instance();
|
| + mojom::ImeInstance* ime_instance = bridge_service_->ime_instance();
|
| if (!ime_instance) {
|
| LOG(ERROR) << "ArcImeInstance method called before being ready.";
|
| return;
|
| @@ -115,11 +117,11 @@ void ArcImeBridgeImpl::SendInsertText(const base::string16& text) {
|
| ime_instance->InsertText(base::UTF16ToUTF8(text));
|
| }
|
|
|
| -void ArcImeBridgeImpl::OnTextInputTypeChanged(arc::TextInputType type) {
|
| +void ArcImeBridgeImpl::OnTextInputTypeChanged(arc::mojom::TextInputType type) {
|
| delegate_->OnTextInputTypeChanged(ConvertTextInputType(type));
|
| }
|
|
|
| -void ArcImeBridgeImpl::OnCursorRectChanged(arc::CursorRectPtr rect) {
|
| +void ArcImeBridgeImpl::OnCursorRectChanged(arc::mojom::CursorRectPtr rect) {
|
| delegate_->OnCursorRectChanged(gfx::Rect(
|
| rect->left,
|
| rect->top,
|
|
|