From 4a29a13568e1562435f860a797f63b1963c1cd06 Mon Sep 17 00:00:00 2001 From: Hiroyuki Komatsu Date: Wed, 3 Jan 2024 09:12:51 +0000 Subject: [PATCH] Update build rules for `protocol`. PiperOrigin-RevId: 595325711 --- src/android/jni/mozcjni.cc | 2 +- src/client/client.cc | 4 +-- src/client/client.gyp | 6 ++-- src/client/client.h | 4 +-- src/client/client_interface.h | 4 +-- src/client/client_mock.h | 4 +-- src/client/client_performance_test_main.cc | 4 +-- src/client/client_quality_test_main.cc | 2 +- src/client/client_scenario_test_main.cc | 4 +-- src/client/client_stress_test_main.cc | 2 +- src/client/client_test.cc | 4 +-- src/composer/composer.cc | 4 +-- src/composer/composer.gyp | 10 +++--- src/composer/composer.h | 4 +-- src/composer/composer_main.cc | 4 +-- src/composer/composer_test.cc | 4 +-- src/composer/composer_test.gyp | 4 +-- src/composer/internal/composition_input.h | 2 +- src/composer/key_event_util.cc | 2 +- src/composer/key_event_util_test.cc | 2 +- src/composer/key_parser.cc | 2 +- src/composer/key_parser.h | 2 +- src/composer/key_parser_test.cc | 2 +- src/composer/table.cc | 4 +-- src/composer/table.h | 4 +-- src/composer/table_test.cc | 4 +-- src/config/character_form_manager.cc | 2 +- src/config/character_form_manager.h | 2 +- src/config/config.gyp | 4 +-- src/config/config_handler.cc | 2 +- src/config/config_handler.h | 2 +- src/config/config_handler_test.cc | 2 +- src/config/stats_config_util.cc | 2 +- src/config/stats_config_util_test.cc | 2 +- src/converter/candidate_filter.cc | 2 +- src/converter/candidate_filter_test.cc | 2 +- src/converter/converter.cc | 2 +- src/converter/converter.gyp | 2 +- src/converter/converter_base.gyp | 8 ++--- src/converter/converter_main.cc | 4 +-- src/converter/converter_regression_test.cc | 2 +- src/converter/converter_test.cc | 4 +-- src/converter/converter_test.gyp | 4 +-- src/converter/gen_segmenter_bitarray.cc | 2 +- src/converter/immutable_converter.cc | 4 +-- src/converter/immutable_converter_test.cc | 2 +- src/converter/node_list_builder.h | 2 +- src/converter/quality_regression_util.cc | 2 +- src/converter/quality_regression_util.h | 4 +-- src/data_manager/data_manager.cc | 2 +- src/data_manager/data_manager_base.gyp | 2 +- src/dictionary/dictionary.gyp | 6 ++-- src/dictionary/dictionary_base.gyp | 4 +-- src/dictionary/dictionary_impl.cc | 2 +- src/dictionary/dictionary_impl_test.cc | 2 +- .../system/system_dictionary_test.cc | 4 +-- src/dictionary/user_dictionary.cc | 4 +-- src/dictionary/user_dictionary.h | 2 +- src/dictionary/user_dictionary_importer.cc | 2 +- src/dictionary/user_dictionary_importer.h | 2 +- src/dictionary/user_dictionary_session.cc | 2 +- src/dictionary/user_dictionary_session.h | 2 +- .../user_dictionary_session_handler.cc | 2 +- .../user_dictionary_session_handler.h | 2 +- .../user_dictionary_session_handler_test.cc | 2 +- .../user_dictionary_session_test.cc | 2 +- src/dictionary/user_dictionary_storage.cc | 2 +- src/dictionary/user_dictionary_storage.h | 2 +- .../user_dictionary_storage_test.cc | 2 +- src/dictionary/user_dictionary_test.cc | 4 +-- src/dictionary/user_dictionary_util.cc | 2 +- src/dictionary/user_dictionary_util.h | 2 +- src/engine/engine.gyp | 10 +++--- src/engine/engine_builder.cc | 2 +- src/engine/engine_builder.h | 2 +- src/engine/engine_builder_test.cc | 2 +- src/gui/config_dialog/character_form_editor.h | 2 +- src/gui/config_dialog/config_dialog.cc | 2 +- src/gui/config_dialog/config_dialog.h | 2 +- src/gui/config_dialog/keymap_editor.cc | 4 +-- src/gui/dictionary_tool/dictionary_tool.cc | 2 +- src/gui/gui.gyp | 22 ++++++------ .../word_register_dialog.cc | 2 +- src/ios/ios_engine.cc | 4 +-- src/ios/ios_engine.h | 4 +-- src/ios/ios_engine_main.cc | 2 +- src/mac/GoogleJapaneseInputController.h | 2 +- src/mac/GoogleJapaneseInputController.mm | 4 +-- .../GoogleJapaneseInputControllerInterface.h | 2 +- src/mac/GoogleJapaneseInputController_test.mm | 2 +- src/mac/GoogleJapaneseInputServer.mm | 2 +- src/mac/KeyCodeMap.mm | 2 +- src/mac/mac.gyp | 6 ++-- .../dictionary_prediction_aggregator.cc | 2 +- .../dictionary_prediction_aggregator_test.cc | 4 +-- src/prediction/dictionary_predictor.cc | 2 +- src/prediction/dictionary_predictor_test.cc | 4 +-- src/prediction/prediction.gyp | 2 +- src/prediction/prediction_test.gyp | 4 +-- src/prediction/predictor.cc | 4 +-- src/prediction/predictor_test.cc | 4 +-- .../single_kanji_prediction_aggregator.cc | 2 +- ...single_kanji_prediction_aggregator_test.cc | 4 +-- src/prediction/user_history_predictor.cc | 4 +-- src/prediction/user_history_predictor_test.cc | 4 +-- src/renderer/mac/CandidateController.mm | 2 +- src/renderer/mac/CandidateView.mm | 4 +-- src/renderer/mac/CandidateWindow.mm | 2 +- src/renderer/mac/InfolistView.mm | 4 +-- src/renderer/mac/InfolistWindow.mm | 2 +- src/renderer/mac/RendererBaseWindow.mm | 2 +- src/renderer/mac/mac_server.mm | 2 +- src/renderer/mac/mac_server_send_command.mm | 2 +- src/renderer/mac/mac_view_util.h | 2 +- src/renderer/mac/mac_view_util.mm | 2 +- src/renderer/qt/qt_server.cc | 2 +- src/renderer/qt/qt_window_manager.cc | 2 +- src/renderer/qt/qt_window_manager.h | 4 +-- src/renderer/renderer.gyp | 36 +++++++++---------- src/renderer/renderer_client.cc | 2 +- src/renderer/renderer_client.h | 2 +- src/renderer/renderer_client_test.cc | 4 +-- src/renderer/renderer_interface.h | 2 +- src/renderer/renderer_server.cc | 6 ++-- src/renderer/renderer_server_test.cc | 2 +- src/renderer/renderer_style_handler.cc | 2 +- src/renderer/win32/candidate_window.cc | 4 +-- src/renderer/win32/candidate_window.h | 4 +-- src/renderer/win32/indicator_window.cc | 4 +-- src/renderer/win32/indicator_window.h | 2 +- src/renderer/win32/infolist_window.cc | 8 ++--- src/renderer/win32/infolist_window.h | 4 +-- src/renderer/win32/text_renderer.cc | 2 +- src/renderer/win32/win32_renderer_client.cc | 2 +- src/renderer/win32/win32_renderer_util.cc | 2 +- .../win32/win32_renderer_util_test.cc | 4 +-- src/renderer/win32/win32_server.cc | 2 +- src/renderer/win32/window_manager.cc | 4 +-- src/renderer/win32/window_manager.h | 2 +- src/request/conversion_request.h | 4 +-- src/request/request.gyp | 4 +-- src/rewriter/a11y_description_rewriter.cc | 2 +- .../a11y_description_rewriter_test.cc | 2 +- src/rewriter/calculator_rewriter.cc | 4 +-- src/rewriter/calculator_rewriter_test.cc | 4 +-- src/rewriter/command_rewriter.cc | 2 +- src/rewriter/command_rewriter.h | 2 +- src/rewriter/command_rewriter_test.cc | 4 +-- src/rewriter/correction_rewriter.cc | 2 +- src/rewriter/correction_rewriter_test.cc | 4 +-- src/rewriter/date_rewriter.cc | 4 +-- src/rewriter/date_rewriter_test.cc | 4 +-- src/rewriter/emoji_rewriter.cc | 4 +-- src/rewriter/emoji_rewriter_test.cc | 4 +-- src/rewriter/emoticon_rewriter.cc | 4 +-- src/rewriter/emoticon_rewriter_test.cc | 4 +-- src/rewriter/english_variants_rewriter.cc | 2 +- .../english_variants_rewriter_test.cc | 2 +- src/rewriter/environmental_filter_rewriter.cc | 2 +- .../environmental_filter_rewriter_test.cc | 2 +- src/rewriter/language_aware_rewriter.cc | 4 +-- src/rewriter/language_aware_rewriter_test.cc | 4 +-- src/rewriter/merger_rewriter.h | 4 +-- src/rewriter/merger_rewriter_test.cc | 2 +- src/rewriter/number_rewriter.cc | 4 +-- src/rewriter/number_rewriter_test.cc | 2 +- .../remove_redundant_candidate_rewriter.cc | 2 +- ...emove_redundant_candidate_rewriter_test.cc | 2 +- src/rewriter/rewriter.gyp | 4 +-- src/rewriter/rewriter_test.gyp | 8 ++--- src/rewriter/single_kanji_rewriter.cc | 4 +-- src/rewriter/single_kanji_rewriter_test.cc | 2 +- src/rewriter/small_letter_rewriter.cc | 2 +- src/rewriter/small_letter_rewriter_test.cc | 4 +-- src/rewriter/symbol_rewriter.cc | 4 +-- src/rewriter/symbol_rewriter_test.cc | 2 +- src/rewriter/t13n_promotion_rewriter.cc | 2 +- src/rewriter/t13n_promotion_rewriter_test.cc | 2 +- src/rewriter/transliteration_rewriter.cc | 2 +- src/rewriter/transliteration_rewriter_test.cc | 4 +-- src/rewriter/unicode_rewriter_test.cc | 4 +-- src/rewriter/usage_rewriter.cc | 2 +- src/rewriter/usage_rewriter_test.cc | 4 +-- .../user_boundary_history_rewriter.cc | 2 +- .../user_boundary_history_rewriter_test.cc | 2 +- src/rewriter/user_segment_history_rewriter.cc | 2 +- .../user_segment_history_rewriter_test.cc | 2 +- src/rewriter/variants_rewriter.cc | 2 +- src/rewriter/variants_rewriter_test.cc | 4 +-- src/rewriter/version_rewriter.h | 2 +- src/rewriter/version_rewriter_test.cc | 2 +- src/rewriter/zipcode_rewriter.cc | 2 +- src/rewriter/zipcode_rewriter_test.cc | 2 +- src/server/mozc_rpc_server_main.cc | 2 +- src/server/server.gyp | 2 +- src/session/internal/ime_context.cc | 2 +- src/session/internal/ime_context.h | 4 +-- src/session/internal/ime_context_test.cc | 4 +-- src/session/internal/key_event_transformer.cc | 4 +-- src/session/internal/key_event_transformer.h | 4 +-- .../internal/key_event_transformer_test.cc | 4 +-- src/session/internal/keymap.cc | 4 +-- src/session/internal/keymap.h | 4 +-- src/session/internal/keymap_test.cc | 4 +-- src/session/internal/session_output.cc | 4 +-- src/session/internal/session_output.h | 4 +-- src/session/internal/session_output_test.cc | 4 +-- src/session/key_info_util.cc | 4 +-- src/session/key_info_util.h | 2 +- src/session/key_info_util_test.cc | 4 +-- src/session/random_keyevents_generator.cc | 2 +- src/session/random_keyevents_generator.h | 2 +- src/session/session.cc | 4 +-- src/session/session.gyp | 30 ++++++++-------- src/session/session.h | 4 +-- src/session/session_base.gyp | 14 ++++---- src/session/session_client_main.cc | 2 +- src/session/session_converter.cc | 6 ++-- src/session/session_converter.h | 4 +-- src/session/session_converter_interface.h | 4 +-- src/session/session_converter_stress_test.cc | 4 +-- src/session/session_converter_test.cc | 6 ++-- src/session/session_handler.cc | 8 ++--- src/session/session_handler.h | 4 +-- src/session/session_handler_interface.h | 2 +- src/session/session_handler_main.cc | 4 +-- src/session/session_handler_scenario_test.cc | 2 +- src/session/session_handler_stress_test.cc | 2 +- src/session/session_handler_test.cc | 4 +-- src/session/session_handler_test_util.cc | 4 +-- src/session/session_handler_tool.cc | 6 ++-- src/session/session_handler_tool.h | 6 ++-- src/session/session_interface.h | 4 +-- src/session/session_regression_test.cc | 6 ++-- src/session/session_server.cc | 2 +- src/session/session_test.cc | 6 ++-- src/session/session_test.gyp | 18 +++++----- src/session/session_usage_observer.cc | 6 ++-- src/session/session_usage_observer_test.cc | 2 +- src/session/session_usage_stats_util.cc | 2 +- src/session/session_usage_stats_util.h | 2 +- src/session/session_usage_stats_util_test.cc | 2 +- src/spelling/spellchecker_service_interface.h | 2 +- src/unix/emacs/emacs.gyp | 8 ++--- src/unix/emacs/mozc_emacs_helper.cc | 2 +- src/unix/emacs/mozc_emacs_helper_lib.cc | 4 +-- src/unix/emacs/mozc_emacs_helper_lib.h | 2 +- src/unix/emacs/mozc_emacs_helper_lib_test.cc | 4 +-- src/unix/ibus/candidate_window_handler.cc | 4 +-- src/unix/ibus/candidate_window_handler.h | 2 +- .../ibus/candidate_window_handler_test.cc | 2 +- .../ibus/ibus_candidate_window_handler.cc | 4 +-- src/unix/ibus/key_event_handler.h | 2 +- src/unix/ibus/key_event_handler_test.cc | 4 +-- src/unix/ibus/key_translator.h | 2 +- src/unix/ibus/key_translator_test.cc | 2 +- src/unix/ibus/mozc_engine.cc | 6 ++-- src/unix/ibus/mozc_engine.h | 4 +-- src/unix/ibus/mozc_engine_test.cc | 2 +- src/unix/ibus/preedit_handler.cc | 2 +- src/unix/ibus/property_handler.cc | 2 +- src/unix/ibus/property_handler.h | 2 +- src/win32/base/config_snapshot.cc | 2 +- src/win32/base/deleter.cc | 2 +- src/win32/base/keyevent_handler.cc | 2 +- src/win32/base/keyevent_handler_test.cc | 2 +- src/win32/base/string_util.cc | 2 +- src/win32/base/win32_base.gyp | 8 ++--- src/win32/broker/broker.gyp | 2 +- src/win32/tip/tip.gyp | 4 +-- src/win32/tip/tip_edit_session.cc | 4 +-- src/win32/tip/tip_edit_session_impl.cc | 2 +- src/win32/tip/tip_keyevent_handler.cc | 2 +- src/win32/tip/tip_lang_bar.cc | 2 +- src/win32/tip/tip_private_context.cc | 2 +- src/win32/tip/tip_query_provider.cc | 4 +-- src/win32/tip/tip_text_service.cc | 2 +- src/win32/tip/tip_ui_element_delegate.cc | 6 ++-- src/win32/tip/tip_ui_element_manager.cc | 4 +-- src/win32/tip/tip_ui_handler_conventional.cc | 6 ++-- 280 files changed, 493 insertions(+), 493 deletions(-) diff --git a/src/android/jni/mozcjni.cc b/src/android/jni/mozcjni.cc index 5efc667a6..6030ab4b9 100644 --- a/src/android/jni/mozcjni.cc +++ b/src/android/jni/mozcjni.cc @@ -35,7 +35,6 @@ #include -#include "protocol/commands.pb.h" #include "absl/random/random.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" @@ -48,6 +47,7 @@ #include "engine/engine.h" #include "engine/engine_builder.h" #include "engine/minimal_engine.h" +#include "protocol/commands.pb.h" #include "session/session_handler.h" #include "session/session_usage_observer.h" diff --git a/src/client/client.cc b/src/client/client.cc index 4a895a60c..1f8948df4 100644 --- a/src/client/client.cc +++ b/src/client/client.cc @@ -39,8 +39,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/base/attributes.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -57,6 +55,8 @@ #include "client/client_interface.h" #include "config/config_handler.h" #include "ipc/ipc.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/key_info_util.h" #ifdef _WIN32 diff --git a/src/client/client.gyp b/src/client/client.gyp index 388e7f18d..7cd8c415d 100644 --- a/src/client/client.gyp +++ b/src/client/client.gyp @@ -45,12 +45,12 @@ '<(mozc_oss_src_dir)/base/base.gyp:version', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:key_info_util', ], 'export_dependent_settings': [ - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', ], }, ], diff --git a/src/client/client.h b/src/client/client.h index 5a8c436cb..9953eb4bd 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -38,8 +38,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "base/run_level.h" @@ -47,6 +45,8 @@ #include "client/client_interface.h" #include "composer/key_event_util.h" #include "ipc/ipc.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit_prod.h" // for FRIEND_TEST() diff --git a/src/client/client_interface.h b/src/client/client_interface.h index 72cd2986d..2afb9144c 100644 --- a/src/client/client_interface.h +++ b/src/client/client_interface.h @@ -36,11 +36,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "ipc/ipc.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { diff --git a/src/client/client_mock.h b/src/client/client_mock.h index 1dbe54427..91dd3e71d 100644 --- a/src/client/client_mock.h +++ b/src/client/client_mock.h @@ -33,11 +33,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gmock.h" namespace mozc { diff --git a/src/client/client_performance_test_main.cc b/src/client/client_performance_test_main.cc index d84ac389f..dd7157bff 100644 --- a/src/client/client_performance_test_main.cc +++ b/src/client/client_performance_test_main.cc @@ -43,8 +43,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/algorithm/container.h" #include "absl/flags/flag.h" #include "absl/strings/str_format.h" @@ -60,6 +58,8 @@ #include "base/util.h" #include "client/client.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/random_keyevents_generator.h" ABSL_FLAG(std::string, server_path, "", "specify server path"); diff --git a/src/client/client_quality_test_main.cc b/src/client/client_quality_test_main.cc index ec040468f..63f1b2537 100644 --- a/src/client/client_quality_test_main.cc +++ b/src/client/client_quality_test_main.cc @@ -39,7 +39,6 @@ #include #include "evaluation/scorer.h" -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/flags/flag.h" #include "absl/strings/str_join.h" @@ -54,6 +53,7 @@ #include "base/util.h" #include "base/vlog.h" #include "client/client.h" +#include "protocol/commands.pb.h" ABSL_FLAG(std::string, server_path, "", "specify server path"); ABSL_FLAG(std::string, log_path, "", "specify log output file path"); diff --git a/src/client/client_scenario_test_main.cc b/src/client/client_scenario_test_main.cc index 5b9fa280b..3db63b22d 100644 --- a/src/client/client_scenario_test_main.cc +++ b/src/client/client_scenario_test_main.cc @@ -39,8 +39,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/renderer_command.pb.h" #include "absl/flags/flag.h" #include "absl/status/status.h" #include "absl/strings/match.h" @@ -55,6 +53,8 @@ #include "base/vlog.h" #include "client/client.h" #include "composer/key_parser.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_command.pb.h" #include "renderer/renderer_client.h" ABSL_FLAG(std::string, input, "", "Input file"); diff --git a/src/client/client_stress_test_main.cc b/src/client/client_stress_test_main.cc index fffd0534d..4e2b92f0f 100644 --- a/src/client/client_stress_test_main.cc +++ b/src/client/client_stress_test_main.cc @@ -42,7 +42,6 @@ #include #endif // _WIN32 -#include "protocol/renderer_command.pb.h" #include "absl/flags/flag.h" #include "absl/time/clock.h" #include "absl/time/time.h" @@ -50,6 +49,7 @@ #include "base/logging.h" #include "base/vlog.h" #include "client/client.h" +#include "protocol/renderer_command.pb.h" #include "renderer/renderer_client.h" #include "session/random_keyevents_generator.h" diff --git a/src/client/client_test.cc b/src/client/client_test.cc index cb72a949c..4ca4ddfa6 100644 --- a/src/client/client_test.cc +++ b/src/client/client_test.cc @@ -35,8 +35,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" @@ -51,6 +49,8 @@ #include "config/config_handler.h" #include "ipc/ipc.h" #include "ipc/ipc_mock.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/composer/composer.cc b/src/composer/composer.cc index 4746c82fc..9d8bd8c88 100644 --- a/src/composer/composer.cc +++ b/src/composer/composer.cc @@ -40,8 +40,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" @@ -61,6 +59,8 @@ #include "composer/table.h" #include "config/character_form_manager.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "transliteration/transliteration.h" namespace mozc { diff --git a/src/composer/composer.gyp b/src/composer/composer.gyp index c5a60a97b..2383164d9 100644 --- a/src/composer/composer.gyp +++ b/src/composer/composer.gyp @@ -60,8 +60,8 @@ '<(mozc_oss_src_dir)/config/config.gyp:character_form_manager', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/protobuf/protobuf.gyp:protobuf', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/transliteration/transliteration.gyp:transliteration', ], }, @@ -73,7 +73,7 @@ ], 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', ], }, { @@ -85,8 +85,8 @@ 'dependencies': [ '<(mozc_oss_src_dir)/base/absl.gyp:absl_strings', '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', ], }, ], diff --git a/src/composer/composer.h b/src/composer/composer.h index 8c2b2766d..1364c8243 100644 --- a/src/composer/composer.h +++ b/src/composer/composer.h @@ -39,14 +39,14 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/strings/string_view.h" #include "composer/internal/composition.h" #include "composer/internal/composition_input.h" #include "composer/internal/transliterators.h" #include "composer/table.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit_prod.h" // for FRIEND_TEST() #include "transliteration/transliteration.h" diff --git a/src/composer/composer_main.cc b/src/composer/composer_main.cc index ecd30edba..6fb0a3520 100644 --- a/src/composer/composer_main.cc +++ b/src/composer/composer_main.cc @@ -33,12 +33,12 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/flags/flag.h" #include "base/init_mozc.h" #include "composer/composer.h" #include "composer/table.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "transliteration/transliteration.h" ABSL_FLAG(std::string, table, "system://romanji-hiragana.tsv", diff --git a/src/composer/composer_test.cc b/src/composer/composer_test.cc index df20c9f2b..238479abc 100644 --- a/src/composer/composer_test.cc +++ b/src/composer/composer_test.cc @@ -39,8 +39,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" @@ -52,6 +50,8 @@ #include "config/config_handler.h" #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "transliteration/transliteration.h" diff --git a/src/composer/composer_test.gyp b/src/composer/composer_test.gyp index 662c6d783..8381629dd 100644 --- a/src/composer/composer_test.gyp +++ b/src/composer/composer_test.gyp @@ -48,8 +48,8 @@ '<(mozc_oss_src_dir)/base/base_test.gyp:clock_mock', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/data_manager/testing/mock_data_manager.gyp:mock_data_manager', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', 'composer.gyp:composer', diff --git a/src/composer/internal/composition_input.h b/src/composer/internal/composition_input.h index 1c5fc6c32..7ce7badff 100644 --- a/src/composer/internal/composition_input.h +++ b/src/composer/internal/composition_input.h @@ -33,10 +33,10 @@ #include #include -#include "protocol/commands.pb.h" #include "base/protobuf/repeated_field.h" #include "base/strings/assign.h" #include "composer/table.h" +#include "protocol/commands.pb.h" namespace mozc { namespace composer { diff --git a/src/composer/key_event_util.cc b/src/composer/key_event_util.cc index af35ac7b7..e58bb61de 100644 --- a/src/composer/key_event_util.cc +++ b/src/composer/key_event_util.cc @@ -33,8 +33,8 @@ #include #include -#include "protocol/commands.pb.h" #include "base/logging.h" +#include "protocol/commands.pb.h" namespace mozc { namespace { diff --git a/src/composer/key_event_util_test.cc b/src/composer/key_event_util_test.cc index 98505e3c9..a173a4917 100644 --- a/src/composer/key_event_util_test.cc +++ b/src/composer/key_event_util_test.cc @@ -34,10 +34,10 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "composer/key_parser.h" +#include "protocol/commands.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/composer/key_parser.cc b/src/composer/key_parser.cc index 9510025b5..33d266708 100644 --- a/src/composer/key_parser.cc +++ b/src/composer/key_parser.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/btree_set.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" @@ -45,6 +44,7 @@ #include "base/logging.h" #include "base/util.h" #include "base/vlog.h" +#include "protocol/commands.pb.h" namespace mozc { namespace { diff --git a/src/composer/key_parser.h b/src/composer/key_parser.h index 419f6bfd0..115fdb7d0 100644 --- a/src/composer/key_parser.h +++ b/src/composer/key_parser.h @@ -34,9 +34,9 @@ #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include "protocol/commands.pb.h" namespace mozc { diff --git a/src/composer/key_parser_test.cc b/src/composer/key_parser_test.cc index 1ae412ecd..2fa5b15a5 100644 --- a/src/composer/key_parser_test.cc +++ b/src/composer/key_parser_test.cc @@ -32,9 +32,9 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "composer/key_event_util.h" +#include "protocol/commands.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/composer/table.cc b/src/composer/table.cc index d3c9ad1e7..dcf3a45e5 100644 --- a/src/composer/table.cc +++ b/src/composer/table.cc @@ -40,8 +40,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" @@ -52,6 +50,8 @@ #include "base/util.h" #include "composer/internal/special_key.h" #include "data_manager/data_manager_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { namespace composer { diff --git a/src/composer/table.h b/src/composer/table.h index 7306af960..4932a52df 100644 --- a/src/composer/table.h +++ b/src/composer/table.h @@ -40,14 +40,14 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" #include "base/container/trie.h" #include "composer/internal/special_key.h" #include "data_manager/data_manager_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { namespace composer { diff --git a/src/composer/table_test.cc b/src/composer/table_test.cc index cb285a6b1..b95c1bfc1 100644 --- a/src/composer/table_test.cc +++ b/src/composer/table_test.cc @@ -33,13 +33,13 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" #include "composer/internal/special_key.h" #include "config/config_handler.h" #include "data_manager/testing/mock_data_manager.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit.h" namespace mozc::composer { diff --git a/src/config/character_form_manager.cc b/src/config/character_form_manager.cc index 905eac8ac..2429eedb1 100644 --- a/src/config/character_form_manager.cc +++ b/src/config/character_form_manager.cc @@ -38,7 +38,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -51,6 +50,7 @@ #include "base/strings/unicode.h" #include "base/util.h" #include "config/config_handler.h" +#include "protocol/config.pb.h" #include "storage/lru_storage.h" namespace mozc { diff --git a/src/config/character_form_manager.h b/src/config/character_form_manager.h index c93fb581e..75e03b5ff 100644 --- a/src/config/character_form_manager.h +++ b/src/config/character_form_manager.h @@ -34,10 +34,10 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/number_util.h" #include "base/singleton.h" +#include "protocol/config.pb.h" namespace mozc { diff --git a/src/config/config.gyp b/src/config/config.gyp index 418e8f758..fe6c1b044 100644 --- a/src/config/config.gyp +++ b/src/config/config.gyp @@ -45,7 +45,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:config_file_stream', '<(mozc_oss_src_dir)/base/base.gyp:hash', '<(mozc_oss_src_dir)/base/base.gyp:version', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', ], }, { @@ -70,7 +70,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/base/base.gyp:config_file_stream', '<(mozc_oss_src_dir)/base/base.gyp:japanese_util', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', # storage.gyp:storage is depended by character_form_manager. # TODO(komatsu): delete this line. '<(mozc_oss_src_dir)/storage/storage.gyp:storage', diff --git a/src/config/config_handler.cc b/src/config/config_handler.cc index 8a950bc65..35ba297c5 100644 --- a/src/config/config_handler.cc +++ b/src/config/config_handler.cc @@ -36,7 +36,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/base/thread_annotations.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" @@ -51,6 +50,7 @@ #include "base/strings/assign.h" #include "base/system_util.h" #include "base/version.h" +#include "protocol/config.pb.h" namespace mozc { namespace config { diff --git a/src/config/config_handler.h b/src/config/config_handler.h index 7257efa54..545823315 100644 --- a/src/config/config_handler.h +++ b/src/config/config_handler.h @@ -35,8 +35,8 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" +#include "protocol/config.pb.h" namespace mozc { namespace config { diff --git a/src/config/config_handler_test.cc b/src/config/config_handler_test.cc index a9852d9a6..0a34f5fd2 100644 --- a/src/config/config_handler_test.cc +++ b/src/config/config_handler_test.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/random/random.h" #include "absl/strings/str_cat.h" @@ -49,6 +48,7 @@ #include "base/file_util.h" #include "base/system_util.h" #include "base/thread.h" +#include "protocol/config.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/config/stats_config_util.cc b/src/config/stats_config_util.cc index e43aa4c7c..b02317cbb 100644 --- a/src/config/stats_config_util.cc +++ b/src/config/stats_config_util.cc @@ -53,8 +53,8 @@ #endif // __APPLE__ #if defined(__ANDROID__) -#include "protocol/config.pb.h" #include "config/config_handler.h" +#include "protocol/config.pb.h" #endif // __ANDROID__ #include "absl/strings/str_cat.h" diff --git a/src/config/stats_config_util_test.cc b/src/config/stats_config_util_test.cc index 37a082c5a..70e1c1256 100644 --- a/src/config/stats_config_util_test.cc +++ b/src/config/stats_config_util_test.cc @@ -38,9 +38,9 @@ #include "testing/gunit.h" #ifdef __ANDROID__ -#include "protocol/config.pb.h" #include "base/file/temp_dir.h" #include "config/config_handler.h" +#include "protocol/config.pb.h" #include "testing/mozctest.h" #endif // __ANDROID__ diff --git a/src/converter/candidate_filter.cc b/src/converter/candidate_filter.cc index 0c5ffff7f..7cc89c7bb 100644 --- a/src/converter/candidate_filter.cc +++ b/src/converter/candidate_filter.cc @@ -39,7 +39,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "base/logging.h" @@ -50,6 +49,7 @@ #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" #include "prediction/suggestion_filter.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/converter/candidate_filter_test.cc b/src/converter/candidate_filter_test.cc index 3b7494ecc..efc76296a 100644 --- a/src/converter/candidate_filter_test.cc +++ b/src/converter/candidate_filter_test.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "base/container/freelist.h" @@ -46,6 +45,7 @@ #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" #include "prediction/suggestion_filter.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gunit.h" diff --git a/src/converter/converter.cc b/src/converter/converter.cc index 33424c0fe..e8c96dfb8 100644 --- a/src/converter/converter.cc +++ b/src/converter/converter.cc @@ -37,7 +37,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "base/japanese_util.h" @@ -50,6 +49,7 @@ #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" #include "prediction/predictor_interface.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" #include "transliteration/transliteration.h" diff --git a/src/converter/converter.gyp b/src/converter/converter.gyp index 413103c26..124ba414a 100644 --- a/src/converter/converter.gyp +++ b/src/converter/converter.gyp @@ -47,7 +47,7 @@ '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', '<(mozc_oss_src_dir)/prediction/prediction.gyp:prediction', '<(mozc_oss_src_dir)/prediction/prediction.gyp:prediction_protocol', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', '<(mozc_oss_src_dir)/rewriter/rewriter.gyp:rewriter', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', diff --git a/src/converter/converter_base.gyp b/src/converter/converter_base.gyp index f561fea18..ea78983d0 100644 --- a/src/converter/converter_base.gyp +++ b/src/converter/converter_base.gyp @@ -85,7 +85,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', '<(mozc_oss_src_dir)/prediction/prediction_base.gyp:suggestion_filter', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/transliteration/transliteration.gyp:transliteration', 'connector', 'lattice', @@ -116,8 +116,8 @@ '<(mozc_oss_src_dir)/dictionary/dictionary.gyp:suffix_dictionary', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:suppression_dictionary', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/rewriter/rewriter_base.gyp:gen_rewriter_files#host', 'connector', 'immutable_converter_interface', @@ -134,7 +134,7 @@ ], 'dependencies' : [ '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:segmenter_data_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:segmenter_data_proto', ] }, { diff --git a/src/converter/converter_main.cc b/src/converter/converter_main.cc index 0dc38c355..cbfa58a0d 100644 --- a/src/converter/converter_main.cc +++ b/src/converter/converter_main.cc @@ -38,8 +38,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/flags/flag.h" #include "absl/log/check.h" #include "absl/status/statusor.h" @@ -66,6 +64,8 @@ #include "data_manager/data_manager.h" #include "engine/engine.h" #include "engine/engine_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" diff --git a/src/converter/converter_regression_test.cc b/src/converter/converter_regression_test.cc index d0e1b35b7..f8af4addf 100644 --- a/src/converter/converter_regression_test.cc +++ b/src/converter/converter_regression_test.cc @@ -29,13 +29,13 @@ #include -#include "protocol/commands.pb.h" #include "composer/composer.h" #include "composer/table.h" #include "converter/converter_interface.h" #include "converter/segments.h" #include "engine/engine_factory.h" #include "engine/engine_interface.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/converter/converter_test.cc b/src/converter/converter_test.cc index d2e91127d..9863605e1 100644 --- a/src/converter/converter_test.cc +++ b/src/converter/converter_test.cc @@ -38,8 +38,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" #include "base/logging.h" @@ -76,6 +74,8 @@ #include "prediction/predictor_interface.h" #include "prediction/suggestion_filter.h" #include "prediction/user_history_predictor.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter.h" #include "rewriter/rewriter_interface.h" diff --git a/src/converter/converter_test.gyp b/src/converter/converter_test.gyp index 175a8d884..ec0a3486a 100644 --- a/src/converter/converter_test.gyp +++ b/src/converter/converter_test.gyp @@ -61,7 +61,7 @@ '<(mozc_oss_src_dir)/engine/engine.gyp:engine_factory', '<(mozc_oss_src_dir)/engine/engine.gyp:mock_data_engine_factory', '<(mozc_oss_src_dir)/prediction/prediction_base.gyp:suggestion_filter', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/rewriter/rewriter.gyp:rewriter', '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', @@ -89,7 +89,7 @@ '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/engine/engine.gyp:engine', '<(mozc_oss_src_dir)/engine/engine.gyp:engine_factory', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', diff --git a/src/converter/gen_segmenter_bitarray.cc b/src/converter/gen_segmenter_bitarray.cc index 286c66872..cd6d3351b 100644 --- a/src/converter/gen_segmenter_bitarray.cc +++ b/src/converter/gen_segmenter_bitarray.cc @@ -42,12 +42,12 @@ #include #include -#include "protocol/segmenter_data.pb.h" #include "absl/base/config.h" #include "absl/container/flat_hash_map.h" #include "base/container/bitarray.h" #include "base/file_stream.h" #include "base/logging.h" +#include "protocol/segmenter_data.pb.h" namespace mozc { diff --git a/src/converter/immutable_converter.cc b/src/converter/immutable_converter.cc index 1a22084c4..4e296015b 100644 --- a/src/converter/immutable_converter.cc +++ b/src/converter/immutable_converter.cc @@ -40,8 +40,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/algorithm/container.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -66,6 +64,8 @@ #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" #include "prediction/suggestion_filter.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/converter/immutable_converter_test.cc b/src/converter/immutable_converter_test.cc index bc24f5a4a..baa8fa7f3 100644 --- a/src/converter/immutable_converter_test.cc +++ b/src/converter/immutable_converter_test.cc @@ -38,7 +38,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "base/logging.h" @@ -61,6 +60,7 @@ #include "dictionary/system/value_dictionary.h" #include "dictionary/user_dictionary_stub.h" #include "prediction/suggestion_filter.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gmock.h" diff --git a/src/converter/node_list_builder.h b/src/converter/node_list_builder.h index 95e27cce3..f454989ff 100644 --- a/src/converter/node_list_builder.h +++ b/src/converter/node_list_builder.h @@ -32,7 +32,6 @@ #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "base/util.h" @@ -40,6 +39,7 @@ #include "converter/node_allocator.h" #include "dictionary/dictionary_interface.h" #include "dictionary/dictionary_token.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/converter/quality_regression_util.cc b/src/converter/quality_regression_util.cc index 29bd65d10..e1605bc41 100644 --- a/src/converter/quality_regression_util.cc +++ b/src/converter/quality_regression_util.cc @@ -36,7 +36,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -54,6 +53,7 @@ #include "composer/table.h" #include "converter/converter_interface.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/converter/quality_regression_util.h b/src/converter/quality_regression_util.h index fe38d4e61..60bd626fb 100644 --- a/src/converter/quality_regression_util.h +++ b/src/converter/quality_regression_util.h @@ -35,11 +35,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { class Segments; diff --git a/src/data_manager/data_manager.cc b/src/data_manager/data_manager.cc index 4065bbe03..94cfcfc1d 100644 --- a/src/data_manager/data_manager.cc +++ b/src/data_manager/data_manager.cc @@ -40,7 +40,6 @@ #include #include -#include "protocol/segmenter_data.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -54,6 +53,7 @@ #include "base/version.h" #include "data_manager/dataset_reader.h" #include "data_manager/serialized_dictionary.h" +#include "protocol/segmenter_data.pb.h" namespace mozc { namespace { diff --git a/src/data_manager/data_manager_base.gyp b/src/data_manager/data_manager_base.gyp index 27f7bafdd..c24530834 100644 --- a/src/data_manager/data_manager_base.gyp +++ b/src/data_manager/data_manager_base.gyp @@ -46,7 +46,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/base/base.gyp:serialized_string_array', '<(mozc_oss_src_dir)/base/base.gyp:version', - '<(mozc_src_dir)/protocol/protocol.gyp:segmenter_data_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:segmenter_data_proto', 'dataset_reader', 'serialized_dictionary', ], diff --git a/src/dictionary/dictionary.gyp b/src/dictionary/dictionary.gyp index 20aeb59c2..5c1547e92 100644 --- a/src/dictionary/dictionary.gyp +++ b/src/dictionary/dictionary.gyp @@ -83,9 +83,9 @@ '<(mozc_oss_src_dir)/base/absl.gyp:absl_strings', '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', 'dictionary_base.gyp:pos_matcher', 'dictionary_base.gyp:suppression_dictionary', ], diff --git a/src/dictionary/dictionary_base.gyp b/src/dictionary/dictionary_base.gyp index 2c72e9bec..b346969f5 100644 --- a/src/dictionary/dictionary_base.gyp +++ b/src/dictionary/dictionary_base.gyp @@ -181,8 +181,8 @@ '<(mozc_oss_src_dir)/base/base.gyp:config_file_stream', '<(mozc_oss_src_dir)/base/base.gyp:number_util', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', 'gen_pos_map#host', diff --git a/src/dictionary/dictionary_impl.cc b/src/dictionary/dictionary_impl.cc index a674dc41f..2ce9c84f6 100644 --- a/src/dictionary/dictionary_impl.cc +++ b/src/dictionary/dictionary_impl.cc @@ -33,7 +33,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "base/util.h" @@ -41,6 +40,7 @@ #include "dictionary/dictionary_token.h" #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" +#include "protocol/config.pb.h" namespace mozc { namespace dictionary { diff --git a/src/dictionary/dictionary_impl_test.cc b/src/dictionary/dictionary_impl_test.cc index 7f57210b2..379b3f7d1 100644 --- a/src/dictionary/dictionary_impl_test.cc +++ b/src/dictionary/dictionary_impl_test.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/system_util.h" #include "base/util.h" @@ -49,6 +48,7 @@ #include "dictionary/system/system_dictionary.h" #include "dictionary/system/value_dictionary.h" #include "dictionary/user_dictionary_stub.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/googletest.h" #include "testing/gunit.h" diff --git a/src/dictionary/system/system_dictionary_test.cc b/src/dictionary/system/system_dictionary_test.cc index 37db54ad9..94112e63b 100644 --- a/src/dictionary/system/system_dictionary_test.cc +++ b/src/dictionary/system/system_dictionary_test.cc @@ -40,8 +40,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/btree_set.h" #include "absl/flags/declare.h" #include "absl/flags/flag.h" @@ -58,6 +56,8 @@ #include "dictionary/pos_matcher.h" #include "dictionary/system/system_dictionary_builder.h" #include "dictionary/text_dictionary_loader.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/dictionary/user_dictionary.cc b/src/dictionary/user_dictionary.cc index 21cb5927e..6d99b46ea 100644 --- a/src/dictionary/user_dictionary.cc +++ b/src/dictionary/user_dictionary.cc @@ -39,8 +39,6 @@ #include #include -#include "protocol/config.pb.h" -#include "protocol/user_dictionary_storage.pb.h" #include "absl/base/thread_annotations.h" #include "absl/container/flat_hash_set.h" #include "absl/status/status.h" @@ -66,6 +64,8 @@ #include "dictionary/user_dictionary_util.h" #include "dictionary/user_pos.h" #include "dictionary/user_pos_interface.h" +#include "protocol/config.pb.h" +#include "protocol/user_dictionary_storage.pb.h" #include "request/conversion_request.h" #include "usage_stats/usage_stats.h" diff --git a/src/dictionary/user_dictionary.h b/src/dictionary/user_dictionary.h index 247dfbe26..7ad859f98 100644 --- a/src/dictionary/user_dictionary.h +++ b/src/dictionary/user_dictionary.h @@ -34,7 +34,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/base/thread_annotations.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" @@ -43,6 +42,7 @@ #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" #include "dictionary/user_pos_interface.h" +#include "protocol/user_dictionary_storage.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/dictionary/user_dictionary_importer.cc b/src/dictionary/user_dictionary_importer.cc index 40e8cab05..bef0311b8 100644 --- a/src/dictionary/user_dictionary_importer.cc +++ b/src/dictionary/user_dictionary_importer.cc @@ -40,7 +40,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/status/statusor.h" #include "absl/strings/match.h" #include "absl/strings/str_split.h" @@ -52,6 +51,7 @@ #include "base/number_util.h" #include "base/util.h" #include "dictionary/user_dictionary_util.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { diff --git a/src/dictionary/user_dictionary_importer.h b/src/dictionary/user_dictionary_importer.h index dd4981a56..13249c4d1 100644 --- a/src/dictionary/user_dictionary_importer.h +++ b/src/dictionary/user_dictionary_importer.h @@ -33,8 +33,8 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/strings/string_view.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { diff --git a/src/dictionary/user_dictionary_session.cc b/src/dictionary/user_dictionary_session.cc index b5282849d..cf2c2d852 100644 --- a/src/dictionary/user_dictionary_session.cc +++ b/src/dictionary/user_dictionary_session.cc @@ -39,7 +39,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/container/fixed_array.h" #include "absl/strings/string_view.h" #include "base/logging.h" @@ -49,6 +48,7 @@ #include "dictionary/user_dictionary_importer.h" #include "dictionary/user_dictionary_storage.h" #include "dictionary/user_dictionary_util.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { namespace user_dictionary { diff --git a/src/dictionary/user_dictionary_session.h b/src/dictionary/user_dictionary_session.h index c95889739..202f74b19 100644 --- a/src/dictionary/user_dictionary_session.h +++ b/src/dictionary/user_dictionary_session.h @@ -36,9 +36,9 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/strings/string_view.h" #include "dictionary/user_dictionary_storage.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { namespace user_dictionary { diff --git a/src/dictionary/user_dictionary_session_handler.cc b/src/dictionary/user_dictionary_session_handler.cc index b1850c2ee..ef2d08a70 100644 --- a/src/dictionary/user_dictionary_session_handler.cc +++ b/src/dictionary/user_dictionary_session_handler.cc @@ -32,12 +32,12 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/random/random.h" #include "base/logging.h" #include "base/protobuf/repeated_field.h" #include "dictionary/user_dictionary_session.h" #include "dictionary/user_dictionary_util.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { namespace user_dictionary { diff --git a/src/dictionary/user_dictionary_session_handler.h b/src/dictionary/user_dictionary_session_handler.h index c28e6ca75..16f651b1e 100644 --- a/src/dictionary/user_dictionary_session_handler.h +++ b/src/dictionary/user_dictionary_session_handler.h @@ -34,12 +34,12 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/random/random.h" #include "absl/strings/string_view.h" #include "base/strings/assign.h" #include "dictionary/user_dictionary_session.h" #include "dictionary/user_dictionary_util.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { namespace user_dictionary { diff --git a/src/dictionary/user_dictionary_session_handler_test.cc b/src/dictionary/user_dictionary_session_handler_test.cc index 988940f49..3853087c7 100644 --- a/src/dictionary/user_dictionary_session_handler_test.cc +++ b/src/dictionary/user_dictionary_session_handler_test.cc @@ -34,12 +34,12 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/strings/string_view.h" #include "base/file_util.h" #include "base/protobuf/protobuf.h" #include "base/protobuf/repeated_field.h" #include "base/system_util.h" +#include "protocol/user_dictionary_storage.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/dictionary/user_dictionary_session_test.cc b/src/dictionary/user_dictionary_session_test.cc index b4c3dfa4c..eea880b70 100644 --- a/src/dictionary/user_dictionary_session_test.cc +++ b/src/dictionary/user_dictionary_session_test.cc @@ -33,11 +33,11 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/strings/string_view.h" #include "base/file_util.h" #include "base/system_util.h" #include "dictionary/user_dictionary_storage.h" +#include "protocol/user_dictionary_storage.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/dictionary/user_dictionary_storage.cc b/src/dictionary/user_dictionary_storage.cc index d56cf10d1..358b06412 100644 --- a/src/dictionary/user_dictionary_storage.cc +++ b/src/dictionary/user_dictionary_storage.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -47,6 +46,7 @@ #include "base/process_mutex.h" #include "base/protobuf/zero_copy_stream_impl.h" #include "dictionary/user_dictionary_util.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { namespace { diff --git a/src/dictionary/user_dictionary_storage.h b/src/dictionary/user_dictionary_storage.h index 57db90d58..cbd642f89 100644 --- a/src/dictionary/user_dictionary_storage.h +++ b/src/dictionary/user_dictionary_storage.h @@ -65,10 +65,10 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { diff --git a/src/dictionary/user_dictionary_storage_test.cc b/src/dictionary/user_dictionary_storage_test.cc index d81913c58..9ccef21be 100644 --- a/src/dictionary/user_dictionary_storage_test.cc +++ b/src/dictionary/user_dictionary_storage_test.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/random/random.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -47,6 +46,7 @@ #include "base/random.h" #include "base/system_util.h" #include "dictionary/user_dictionary_importer.h" +#include "protocol/user_dictionary_storage.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/dictionary/user_dictionary_test.cc b/src/dictionary/user_dictionary_test.cc index 47f530894..e698fc50d 100644 --- a/src/dictionary/user_dictionary_test.cc +++ b/src/dictionary/user_dictionary_test.cc @@ -39,8 +39,6 @@ #include #include -#include "protocol/config.pb.h" -#include "protocol/user_dictionary_storage.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" @@ -60,6 +58,8 @@ #include "dictionary/user_dictionary_storage.h" #include "dictionary/user_pos.h" #include "dictionary/user_pos_interface.h" +#include "protocol/config.pb.h" +#include "protocol/user_dictionary_storage.pb.h" #include "request/conversion_request.h" #include "testing/gmock.h" #include "testing/gunit.h" diff --git a/src/dictionary/user_dictionary_util.cc b/src/dictionary/user_dictionary_util.cc index f229ec0b4..2875d423f 100644 --- a/src/dictionary/user_dictionary_util.cc +++ b/src/dictionary/user_dictionary_util.cc @@ -37,7 +37,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/random/random.h" #include "absl/strings/str_replace.h" #include "absl/strings/string_view.h" @@ -47,6 +46,7 @@ #include "base/strings/japanese.h" #include "base/strings/unicode.h" #include "dictionary/user_pos_interface.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { namespace { diff --git a/src/dictionary/user_dictionary_util.h b/src/dictionary/user_dictionary_util.h index c68f7d6e9..b88b79646 100644 --- a/src/dictionary/user_dictionary_util.h +++ b/src/dictionary/user_dictionary_util.h @@ -38,9 +38,9 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/strings/string_view.h" #include "dictionary/user_pos_interface.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { diff --git a/src/engine/engine.gyp b/src/engine/engine.gyp index b4230a055..ce815a2da 100644 --- a/src/engine/engine.gyp +++ b/src/engine/engine.gyp @@ -46,7 +46,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/data_manager/data_manager_base.gyp:data_manager', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', - '<(mozc_src_dir)/protocol/protocol.gyp:engine_builder_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:engine_builder_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', ], }, @@ -74,14 +74,14 @@ '<(mozc_oss_src_dir)/dictionary/system/system_dictionary.gyp:value_dictionary', '<(mozc_oss_src_dir)/prediction/prediction.gyp:prediction', '<(mozc_oss_src_dir)/prediction/prediction_base.gyp:suggestion_filter', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', '<(mozc_oss_src_dir)/rewriter/rewriter.gyp:rewriter', ], 'export_dependent_settings': [ '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', ], }, { @@ -133,7 +133,7 @@ '<(mozc_oss_src_dir)/converter/converter.gyp:converter', '<(mozc_oss_src_dir)/data_manager/data_manager_base.gyp:data_manager', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:suppression_dictionary', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', ], }, diff --git a/src/engine/engine_builder.cc b/src/engine/engine_builder.cc index 6697452e7..44b67be86 100644 --- a/src/engine/engine_builder.cc +++ b/src/engine/engine_builder.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/engine_builder.pb.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/synchronization/mutex.h" @@ -47,6 +46,7 @@ #include "data_manager/data_manager.h" #include "engine/engine.h" #include "engine/engine_interface.h" +#include "protocol/engine_builder.pb.h" namespace mozc { namespace { diff --git a/src/engine/engine_builder.h b/src/engine/engine_builder.h index 06ef7cdfd..2cdbe319b 100644 --- a/src/engine/engine_builder.h +++ b/src/engine/engine_builder.h @@ -34,12 +34,12 @@ #include #include -#include "protocol/engine_builder.pb.h" #include "absl/base/thread_annotations.h" #include "absl/synchronization/mutex.h" #include "base/thread.h" #include "data_manager/data_manager.h" #include "engine/engine_interface.h" +#include "protocol/engine_builder.pb.h" namespace mozc { diff --git a/src/engine/engine_builder_test.cc b/src/engine/engine_builder_test.cc index 60f29880e..6435d8763 100644 --- a/src/engine/engine_builder_test.cc +++ b/src/engine/engine_builder_test.cc @@ -34,7 +34,6 @@ #include #include -#include "protocol/engine_builder.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "base/file/temp_dir.h" @@ -42,6 +41,7 @@ #include "base/hash.h" #include "engine/engine_interface.h" #include "prediction/predictor_interface.h" +#include "protocol/engine_builder.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/gui/config_dialog/character_form_editor.h b/src/gui/config_dialog/character_form_editor.h index 501188bc0..8c1d9e9cb 100644 --- a/src/gui/config_dialog/character_form_editor.h +++ b/src/gui/config_dialog/character_form_editor.h @@ -33,8 +33,8 @@ #include #include -#include "protocol/config.pb.h" #include "gui/config_dialog/combobox_delegate.h" +#include "protocol/config.pb.h" namespace mozc { namespace gui { diff --git a/src/gui/config_dialog/config_dialog.cc b/src/gui/config_dialog/config_dialog.cc index 4d1b4e5ec..5cde15008 100644 --- a/src/gui/config_dialog/config_dialog.cc +++ b/src/gui/config_dialog/config_dialog.cc @@ -50,7 +50,6 @@ #include #include -#include "protocol/config.pb.h" #include "base/config_file_stream.h" #include "base/logging.h" #include "base/run_level.h" @@ -60,6 +59,7 @@ #include "gui/base/util.h" #include "gui/config_dialog/keymap_editor.h" #include "gui/config_dialog/roman_table_editor.h" +#include "protocol/config.pb.h" #include "session/internal/keymap.h" #ifdef __APPLE__ diff --git a/src/gui/config_dialog/config_dialog.h b/src/gui/config_dialog/config_dialog.h index 5598873b8..85e1c0075 100644 --- a/src/gui/config_dialog/config_dialog.h +++ b/src/gui/config_dialog/config_dialog.h @@ -38,9 +38,9 @@ #include #include -#include "protocol/config.pb.h" #include "client/client_interface.h" #include "gui/config_dialog/ui_config_dialog.h" +#include "protocol/config.pb.h" namespace mozc { namespace gui { diff --git a/src/gui/config_dialog/keymap_editor.cc b/src/gui/config_dialog/keymap_editor.cc index 8537f7d94..033ea1837 100644 --- a/src/gui/config_dialog/keymap_editor.cc +++ b/src/gui/config_dialog/keymap_editor.cc @@ -43,8 +43,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_split.h" @@ -60,6 +58,8 @@ #include "gui/config_dialog/combobox_delegate.h" #include "gui/config_dialog/generic_table_editor.h" #include "gui/config_dialog/keybinding_editor_delegate.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/keymap.h" // TODO(komatsu): internal files should not be used from external modules. diff --git a/src/gui/dictionary_tool/dictionary_tool.cc b/src/gui/dictionary_tool/dictionary_tool.cc index e1e1ceb0f..339220ef5 100644 --- a/src/gui/dictionary_tool/dictionary_tool.cc +++ b/src/gui/dictionary_tool/dictionary_tool.cc @@ -48,7 +48,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" @@ -66,6 +65,7 @@ #include "gui/config_dialog/combobox_delegate.h" #include "gui/dictionary_tool/find_dialog.h" #include "gui/dictionary_tool/import_dialog.h" +#include "protocol/user_dictionary_storage.pb.h" #ifdef _WIN32 #include diff --git a/src/gui/gui.gyp b/src/gui/gui.gyp index 34d090e4d..6b20d88ad 100644 --- a/src/gui/gui.gyp +++ b/src/gui/gui.gyp @@ -58,8 +58,8 @@ '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:user_dictionary', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', '<(mozc_oss_src_dir)/ipc/ipc.gyp:window_info_protocol', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', 'encoding_util', 'gen_base_files', 'qrc_tr', @@ -312,8 +312,8 @@ '<(mozc_oss_src_dir)/composer/composer.gyp:key_parser', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/config/config.gyp:stats_config_util', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:keymap', 'gen_config_dialog_files', 'qrc_config_dialog', @@ -399,9 +399,9 @@ '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/data_manager/data_manager.gyp:pos_list_provider', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:user_dictionary', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', 'encoding_util', 'gen_config_dialog_files', 'gen_dictionary_tool_files', @@ -472,8 +472,8 @@ '<(mozc_oss_src_dir)/data_manager/data_manager.gyp:pos_list_provider', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:user_dictionary', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', 'gen_word_register_dialog_files', 'qrc_word_register_dialog', ], @@ -599,7 +599,7 @@ 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', 'gen_post_install_dialog_files', 'qrc_post_install_dialog', @@ -638,7 +638,7 @@ 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/client/client.gyp:client', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/renderer/renderer.gyp:renderer_client', ], }, diff --git a/src/gui/word_register_dialog/word_register_dialog.cc b/src/gui/word_register_dialog/word_register_dialog.cc index c06026ba8..478cc461f 100644 --- a/src/gui/word_register_dialog/word_register_dialog.cc +++ b/src/gui/word_register_dialog/word_register_dialog.cc @@ -51,7 +51,6 @@ #include #include -#include "protocol/user_dictionary_storage.pb.h" #include "absl/time/time.h" #include "base/const.h" #include "base/logging.h" @@ -62,6 +61,7 @@ #include "dictionary/user_dictionary_storage.h" #include "dictionary/user_dictionary_util.h" #include "gui/base/util.h" +#include "protocol/user_dictionary_storage.pb.h" namespace mozc { namespace gui { diff --git a/src/ios/ios_engine.cc b/src/ios/ios_engine.cc index 03c045834..68a5445d3 100644 --- a/src/ios/ios_engine.cc +++ b/src/ios/ios_engine.cc @@ -34,8 +34,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/user_dictionary_storage.pb.h" #include "absl/flags/flag.h" #include "absl/synchronization/mutex.h" #include "base/logging.h" @@ -44,6 +42,8 @@ #include "engine/engine.h" #include "engine/engine_builder.h" #include "engine/minimal_engine.h" +#include "protocol/commands.pb.h" +#include "protocol/user_dictionary_storage.pb.h" #include "session/session.h" #include "session/session_handler.h" #include "session/session_handler_interface.h" diff --git a/src/ios/ios_engine.h b/src/ios/ios_engine.h index 54682cfb9..5ef7abc8f 100644 --- a/src/ios/ios_engine.h +++ b/src/ios/ios_engine.h @@ -34,11 +34,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/base/thread_annotations.h" #include "absl/synchronization/mutex.h" #include "base/port.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { diff --git a/src/ios/ios_engine_main.cc b/src/ios/ios_engine_main.cc index 24ec6833e..498a92976 100644 --- a/src/ios/ios_engine_main.cc +++ b/src/ios/ios_engine_main.cc @@ -33,12 +33,12 @@ #include #include -#include "protocol/candidates.pb.h" #include "absl/flags/flag.h" #include "base/init_mozc.h" #include "base/logging.h" #include "base/util.h" #include "ios/ios_engine.h" +#include "protocol/candidates.pb.h" // mozc/data_manager/testing:mozc_dataset_for_testing is one of datafile. ABSL_FLAG(std::string, datafile, "", "Path to a data file to be used"); diff --git a/src/mac/GoogleJapaneseInputController.h b/src/mac/GoogleJapaneseInputController.h index 6491454e6..4534aacaf 100644 --- a/src/mac/GoogleJapaneseInputController.h +++ b/src/mac/GoogleJapaneseInputController.h @@ -38,10 +38,10 @@ #include // For mozc::commands::CompositionMode +#include "client/client_interface.h" #include "protocol/commands.pb.h" #include "protocol/config.pb.h" #include "protocol/renderer_command.pb.h" -#include "client/client_interface.h" #include "renderer/renderer_interface.h" /** GoogleJapaneseInputController is a subclass of |IMKInputController|, which holds a connection diff --git a/src/mac/GoogleJapaneseInputController.mm b/src/mac/GoogleJapaneseInputController.mm index db067d3d9..7d35b6497 100644 --- a/src/mac/GoogleJapaneseInputController.mm +++ b/src/mac/GoogleJapaneseInputController.mm @@ -50,8 +50,6 @@ #import "mac/GoogleJapaneseInputServer.h" #import "mac/KeyCodeMap.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/const.h" #include "base/logging.h" @@ -61,6 +59,8 @@ #include "base/util.h" #include "client/client.h" #include "ipc/ipc.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "renderer/renderer_client.h" using mozc::kProductNameInEnglish; diff --git a/src/mac/GoogleJapaneseInputControllerInterface.h b/src/mac/GoogleJapaneseInputControllerInterface.h index fea9e7edc..b3b357123 100644 --- a/src/mac/GoogleJapaneseInputControllerInterface.h +++ b/src/mac/GoogleJapaneseInputControllerInterface.h @@ -32,8 +32,8 @@ #import "mac/KeyCodeMap.h" -#include "protocol/commands.pb.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" #include "renderer/renderer_interface.h" @interface GoogleJapaneseInputController () diff --git a/src/mac/GoogleJapaneseInputController_test.mm b/src/mac/GoogleJapaneseInputController_test.mm index d4c9d10ce..3356bec72 100644 --- a/src/mac/GoogleJapaneseInputController_test.mm +++ b/src/mac/GoogleJapaneseInputController_test.mm @@ -41,13 +41,13 @@ #include #include -#include "protocol/candidates.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/time/clock.h" #include "absl/time/time.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "client/client_mock.h" +#include "protocol/candidates.pb.h" #include "renderer/renderer_interface.h" #include "testing/gmock.h" #include "testing/googletest.h" diff --git a/src/mac/GoogleJapaneseInputServer.mm b/src/mac/GoogleJapaneseInputServer.mm index 56a04d6d7..52abc169e 100644 --- a/src/mac/GoogleJapaneseInputServer.mm +++ b/src/mac/GoogleJapaneseInputServer.mm @@ -31,10 +31,10 @@ #include -#include "protocol/commands.pb.h" #include "absl/base/call_once.h" #include "base/const.h" #include "base/logging.h" +#include "protocol/commands.pb.h" GoogleJapaneseInputServer *g_imkServer = nil; diff --git a/src/mac/KeyCodeMap.mm b/src/mac/KeyCodeMap.mm index 225a0a60d..5114d30f2 100644 --- a/src/mac/KeyCodeMap.mm +++ b/src/mac/KeyCodeMap.mm @@ -33,8 +33,8 @@ #import -#include "protocol/commands.pb.h" #include "base/logging.h" +#include "protocol/commands.pb.h" using mozc::commands::KeyEvent; diff --git a/src/mac/mac.gyp b/src/mac/mac.gyp index 9d3f6c0df..56398fc21 100644 --- a/src/mac/mac.gyp +++ b/src/mac/mac.gyp @@ -44,9 +44,9 @@ '<(mozc_oss_src_dir)/base/absl.gyp:absl_base', '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/client/client.gyp:client', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', '<(mozc_oss_src_dir)/renderer/renderer.gyp:renderer_client', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', 'gen_key_mappings', diff --git a/src/prediction/dictionary_prediction_aggregator.cc b/src/prediction/dictionary_prediction_aggregator.cc index c6e974951..911ea2bcb 100644 --- a/src/prediction/dictionary_prediction_aggregator.cc +++ b/src/prediction/dictionary_prediction_aggregator.cc @@ -40,7 +40,6 @@ #include #include -#include "protocol/commands.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -64,6 +63,7 @@ #include "prediction/result.h" #include "prediction/single_kanji_prediction_aggregator.h" #include "prediction/zero_query_dict.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "transliteration/transliteration.h" diff --git a/src/prediction/dictionary_prediction_aggregator_test.cc b/src/prediction/dictionary_prediction_aggregator_test.cc index 7fe8913a6..656d1ab5c 100644 --- a/src/prediction/dictionary_prediction_aggregator_test.cc +++ b/src/prediction/dictionary_prediction_aggregator_test.cc @@ -40,8 +40,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/memory/memory.h" #include "absl/strings/match.h" @@ -68,6 +66,8 @@ #include "prediction/prediction_aggregator_interface.h" #include "prediction/result.h" #include "prediction/zero_query_dict.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gmock.h" diff --git a/src/prediction/dictionary_predictor.cc b/src/prediction/dictionary_predictor.cc index a0debdbd9..40e258038 100644 --- a/src/prediction/dictionary_predictor.cc +++ b/src/prediction/dictionary_predictor.cc @@ -38,7 +38,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/algorithm/container.h" #include "absl/base/attributes.h" #include "absl/container/flat_hash_map.h" @@ -66,6 +65,7 @@ #include "prediction/rescorer_interface.h" #include "prediction/result.h" #include "prediction/suggestion_filter.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "transliteration/transliteration.h" #include "usage_stats/usage_stats.h" diff --git a/src/prediction/dictionary_predictor_test.cc b/src/prediction/dictionary_predictor_test.cc index 40e38dcdf..019e0ca67 100644 --- a/src/prediction/dictionary_predictor_test.cc +++ b/src/prediction/dictionary_predictor_test.cc @@ -38,8 +38,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/memory/memory.h" #include "absl/random/random.h" #include "absl/strings/match.h" @@ -68,6 +66,8 @@ #include "prediction/rescorer_mock.h" #include "prediction/result.h" #include "prediction/suggestion_filter.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gmock.h" diff --git a/src/prediction/prediction.gyp b/src/prediction/prediction.gyp index aab34b0da..d8bfa61ae 100644 --- a/src/prediction/prediction.gyp +++ b/src/prediction/prediction.gyp @@ -59,7 +59,7 @@ '<(mozc_oss_src_dir)/dictionary/dictionary.gyp:dictionary', '<(mozc_oss_src_dir)/dictionary/dictionary.gyp:suffix_dictionary', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:suppression_dictionary', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', '<(mozc_oss_src_dir)/rewriter/rewriter.gyp:rewriter', '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util', diff --git a/src/prediction/prediction_test.gyp b/src/prediction/prediction_test.gyp index 0bcbf18bd..9f86145fb 100644 --- a/src/prediction/prediction_test.gyp +++ b/src/prediction/prediction_test.gyp @@ -62,8 +62,8 @@ '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', '<(mozc_oss_src_dir)/dictionary/system/system_dictionary.gyp:system_dictionary', '<(mozc_oss_src_dir)/dictionary/system/system_dictionary.gyp:value_dictionary', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util', '<(mozc_oss_src_dir)/storage/storage.gyp:storage', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', diff --git a/src/prediction/predictor.cc b/src/prediction/predictor.cc index d96fd321e..bb221c801 100644 --- a/src/prediction/predictor.cc +++ b/src/prediction/predictor.cc @@ -36,8 +36,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -45,6 +43,8 @@ #include "base/util.h" #include "converter/segments.h" #include "prediction/predictor_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" namespace mozc::prediction { diff --git a/src/prediction/predictor_test.cc b/src/prediction/predictor_test.cc index 63b2a5b60..4147ddb30 100644 --- a/src/prediction/predictor_test.cc +++ b/src/prediction/predictor_test.cc @@ -33,8 +33,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "composer/composer.h" @@ -47,6 +45,8 @@ #include "dictionary/suppression_dictionary.h" #include "prediction/predictor_interface.h" #include "prediction/user_history_predictor.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gmock.h" diff --git a/src/prediction/single_kanji_prediction_aggregator.cc b/src/prediction/single_kanji_prediction_aggregator.cc index 8dc785bee..be4f3c4f0 100644 --- a/src/prediction/single_kanji_prediction_aggregator.cc +++ b/src/prediction/single_kanji_prediction_aggregator.cc @@ -34,7 +34,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "base/strings/assign.h" @@ -45,6 +44,7 @@ #include "dictionary/pos_matcher.h" #include "dictionary/single_kanji_dictionary.h" #include "prediction/result.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" namespace mozc::prediction { diff --git a/src/prediction/single_kanji_prediction_aggregator_test.cc b/src/prediction/single_kanji_prediction_aggregator_test.cc index 1f553c072..6415ba430 100644 --- a/src/prediction/single_kanji_prediction_aggregator_test.cc +++ b/src/prediction/single_kanji_prediction_aggregator_test.cc @@ -32,8 +32,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/strings/unicode.h" #include "composer/composer.h" @@ -43,6 +41,8 @@ #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" #include "prediction/result.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gmock.h" diff --git a/src/prediction/user_history_predictor.cc b/src/prediction/user_history_predictor.cc index d857577a6..952fd324e 100644 --- a/src/prediction/user_history_predictor.cc +++ b/src/prediction/user_history_predictor.cc @@ -43,8 +43,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/hash/hash.h" #include "absl/strings/ascii.h" @@ -70,6 +68,8 @@ #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" #include "prediction/user_history_predictor.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/variants_rewriter.h" #include "storage/encrypted_string_storage.h" diff --git a/src/prediction/user_history_predictor_test.cc b/src/prediction/user_history_predictor_test.cc index 90e8521a0..ea9a5b341 100644 --- a/src/prediction/user_history_predictor_test.cc +++ b/src/prediction/user_history_predictor_test.cc @@ -38,8 +38,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/random/random.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -64,6 +62,8 @@ #include "dictionary/pos_matcher.h" #include "dictionary/suppression_dictionary.h" #include "prediction/user_history_predictor.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "storage/encrypted_string_storage.h" diff --git a/src/renderer/mac/CandidateController.mm b/src/renderer/mac/CandidateController.mm index e0e8d495b..eac336370 100644 --- a/src/renderer/mac/CandidateController.mm +++ b/src/renderer/mac/CandidateController.mm @@ -29,8 +29,8 @@ #import "renderer/mac/CandidateView.h" -#include "protocol/commands.pb.h" #include "base/coordinates.h" +#include "protocol/commands.pb.h" #include "renderer/mac/CandidateController.h" #include "renderer/mac/CandidateWindow.h" #include "renderer/mac/InfolistWindow.h" diff --git a/src/renderer/mac/CandidateView.mm b/src/renderer/mac/CandidateView.mm index c096f3334..c17acd097 100644 --- a/src/renderer/mac/CandidateView.mm +++ b/src/renderer/mac/CandidateView.mm @@ -31,11 +31,11 @@ #import "renderer/mac/CandidateView.h" -#include "protocol/commands.pb.h" -#include "protocol/renderer_style.pb.h" #include "absl/base/call_once.h" #include "base/logging.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_style.pb.h" #include "renderer/mac/mac_view_util.h" #include "renderer/renderer_style_handler.h" #include "renderer/table_layout.h" diff --git a/src/renderer/mac/CandidateWindow.mm b/src/renderer/mac/CandidateWindow.mm index b71c0f111..1da4d6454 100644 --- a/src/renderer/mac/CandidateWindow.mm +++ b/src/renderer/mac/CandidateWindow.mm @@ -32,9 +32,9 @@ #import "CandidateView.h" -#include "protocol/commands.pb.h" #include "base/coordinates.h" #include "base/logging.h" +#include "protocol/commands.pb.h" #include "renderer/mac/CandidateWindow.h" using mozc::commands::Candidates; diff --git a/src/renderer/mac/InfolistView.mm b/src/renderer/mac/InfolistView.mm index 58d686217..2ffc351ba 100644 --- a/src/renderer/mac/InfolistView.mm +++ b/src/renderer/mac/InfolistView.mm @@ -31,10 +31,10 @@ #import "renderer/mac/InfolistView.h" -#include "protocol/commands.pb.h" -#include "protocol/renderer_style.pb.h" #include "base/logging.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_style.pb.h" #include "renderer/mac/mac_view_util.h" #include "renderer/renderer_style_handler.h" #include "renderer/table_layout.h" diff --git a/src/renderer/mac/InfolistWindow.mm b/src/renderer/mac/InfolistWindow.mm index 1b7d03ad7..b06bf7c87 100644 --- a/src/renderer/mac/InfolistWindow.mm +++ b/src/renderer/mac/InfolistWindow.mm @@ -32,10 +32,10 @@ #import "InfolistView.h" -#include "protocol/commands.pb.h" #include "base/coordinates.h" #include "base/logging.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" #include "renderer/mac/InfolistWindow.h" using mozc::commands::Candidates; diff --git a/src/renderer/mac/RendererBaseWindow.mm b/src/renderer/mac/RendererBaseWindow.mm index 3c95d13c7..e6190ec7f 100644 --- a/src/renderer/mac/RendererBaseWindow.mm +++ b/src/renderer/mac/RendererBaseWindow.mm @@ -33,10 +33,10 @@ #include -#include "protocol/commands.pb.h" #include "base/coordinates.h" #include "base/logging.h" #include "base/mac/mac_util.h" +#include "protocol/commands.pb.h" #include "renderer/mac/RendererBaseWindow.h" namespace mozc { diff --git a/src/renderer/mac/mac_server.mm b/src/renderer/mac/mac_server.mm index 5fbfa1c37..0792f1719 100644 --- a/src/renderer/mac/mac_server.mm +++ b/src/renderer/mac/mac_server.mm @@ -37,11 +37,11 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" #include "base/logging.h" #include "base/util.h" +#include "protocol/commands.pb.h" #include "renderer/mac/CandidateController.h" #include "renderer/mac/mac_server_send_command.h" diff --git a/src/renderer/mac/mac_server_send_command.mm b/src/renderer/mac/mac_server_send_command.mm index 9361dfd32..c016ca914 100644 --- a/src/renderer/mac/mac_server_send_command.mm +++ b/src/renderer/mac/mac_server_send_command.mm @@ -33,8 +33,8 @@ #import "mac/common.h" -#include "protocol/commands.pb.h" #include "base/const.h" +#include "protocol/commands.pb.h" namespace mozc { namespace renderer { diff --git a/src/renderer/mac/mac_view_util.h b/src/renderer/mac/mac_view_util.h index f25732a00..a3287c3ec 100644 --- a/src/renderer/mac/mac_view_util.h +++ b/src/renderer/mac/mac_view_util.h @@ -34,8 +34,8 @@ #include -#include "protocol/renderer_style.pb.h" #include "base/coordinates.h" +#include "protocol/renderer_style.pb.h" namespace mozc { namespace renderer { diff --git a/src/renderer/mac/mac_view_util.mm b/src/renderer/mac/mac_view_util.mm index 2ff43c915..3bfc6b4d5 100644 --- a/src/renderer/mac/mac_view_util.mm +++ b/src/renderer/mac/mac_view_util.mm @@ -28,8 +28,8 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "renderer/mac/mac_view_util.h" -#include "protocol/renderer_style.pb.h" #include "base/coordinates.h" +#include "protocol/renderer_style.pb.h" namespace mozc { namespace renderer { diff --git a/src/renderer/qt/qt_server.cc b/src/renderer/qt/qt_server.cc index d8d35f727..612956c9d 100644 --- a/src/renderer/qt/qt_server.cc +++ b/src/renderer/qt/qt_server.cc @@ -38,12 +38,12 @@ #include #include -#include "protocol/renderer_command.pb.h" #include "base/logging.h" #include "base/system_util.h" #include "client/client_interface.h" #include "config/config_handler.h" #include "ipc/named_event.h" +#include "protocol/renderer_command.pb.h" // By default, mozc_renderer quits when user-input continues to be // idle for 10min. diff --git a/src/renderer/qt/qt_window_manager.cc b/src/renderer/qt/qt_window_manager.cc index ab452eeba..e684da463 100644 --- a/src/renderer/qt/qt_window_manager.cc +++ b/src/renderer/qt/qt_window_manager.cc @@ -32,9 +32,9 @@ #include #include -#include "protocol/candidates.pb.h" #include "absl/strings/str_cat.h" #include "base/logging.h" +#include "protocol/candidates.pb.h" #include "renderer/renderer_style_handler.h" #include "renderer/window_util.h" diff --git a/src/renderer/qt/qt_window_manager.h b/src/renderer/qt/qt_window_manager.h index 11a8e8435..bd3c41384 100644 --- a/src/renderer/qt/qt_window_manager.h +++ b/src/renderer/qt/qt_window_manager.h @@ -35,11 +35,11 @@ #include #include -#include "protocol/renderer_command.pb.h" -#include "protocol/renderer_style.pb.h" #include "base/coordinates.h" #include "base/port.h" #include "client/client_interface.h" +#include "protocol/renderer_command.pb.h" +#include "protocol/renderer_style.pb.h" namespace mozc { namespace renderer { diff --git a/src/renderer/renderer.gyp b/src/renderer/renderer.gyp index 71cfb29b3..a32ddf423 100644 --- a/src/renderer/renderer.gyp +++ b/src/renderer/renderer.gyp @@ -71,9 +71,9 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/base/base.gyp:version', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', ], }, { @@ -89,8 +89,8 @@ '<(mozc_oss_src_dir)/client/client.gyp:client', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', ], }, { @@ -175,7 +175,7 @@ 'renderer_style_handler.cc', ], 'dependencies': [ - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', ], 'variables': { 'test_size': 'small', @@ -188,7 +188,7 @@ 'renderer_style_handler_test.cc', ], 'dependencies': [ - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', 'renderer_style_handler', ], @@ -241,9 +241,9 @@ ], 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', ], }, { @@ -281,7 +281,7 @@ ], 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', 'renderer_style_handler', ], 'link_settings': { @@ -334,9 +334,9 @@ '<(mozc_oss_src_dir)/client/client.gyp:client', '<(mozc_oss_src_dir)/config/config.gyp:stats_config_util', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', 'gen_mozc_renderer_resource_header#host', 'renderer_server', 'renderer_style_handler', @@ -362,7 +362,7 @@ 'dependencies': [ '<(mozc_oss_src_dir)/base/absl.gyp:absl_synchronization', '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', 'renderer_client', ], }, @@ -400,9 +400,9 @@ '<(mozc_oss_src_dir)/client/client.gyp:client', '<(mozc_oss_src_dir)/config/config.gyp:stats_config_util', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', 'gen_renderer_files#host', 'renderer_server', 'renderer_style_handler', diff --git a/src/renderer/renderer_client.cc b/src/renderer/renderer_client.cc index b8c8e4d03..a1ccc15e5 100644 --- a/src/renderer/renderer_client.cc +++ b/src/renderer/renderer_client.cc @@ -36,7 +36,6 @@ #include #include -#include "protocol/renderer_command.pb.h" #include "absl/base/thread_annotations.h" #include "absl/synchronization/mutex.h" #include "absl/time/clock.h" @@ -49,6 +48,7 @@ #include "base/version.h" #include "ipc/ipc.h" #include "ipc/named_event.h" +#include "protocol/renderer_command.pb.h" #ifdef __APPLE__ #include "base/mac/mac_util.h" diff --git a/src/renderer/renderer_client.h b/src/renderer/renderer_client.h index fd615683b..f538dc821 100644 --- a/src/renderer/renderer_client.h +++ b/src/renderer/renderer_client.h @@ -33,8 +33,8 @@ #include #include -#include "protocol/renderer_command.pb.h" #include "ipc/ipc.h" +#include "protocol/renderer_command.pb.h" #include "renderer/renderer_interface.h" namespace mozc { diff --git a/src/renderer/renderer_client_test.cc b/src/renderer/renderer_client_test.cc index 3ec3849fd..fe8d6965b 100644 --- a/src/renderer/renderer_client_test.cc +++ b/src/renderer/renderer_client_test.cc @@ -34,8 +34,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/renderer_command.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" @@ -44,6 +42,8 @@ #include "base/number_util.h" #include "base/version.h" #include "ipc/ipc.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_command.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/renderer/renderer_interface.h b/src/renderer/renderer_interface.h index c6e511185..ae87ed1e0 100644 --- a/src/renderer/renderer_interface.h +++ b/src/renderer/renderer_interface.h @@ -30,8 +30,8 @@ #ifndef MOZC_RENDERER_RENDERER_INTERFACE_H_ #define MOZC_RENDERER_RENDERER_INTERFACE_H_ -#include "protocol/renderer_command.pb.h" #include "client/client_interface.h" +#include "protocol/renderer_command.pb.h" namespace mozc { namespace renderer { diff --git a/src/renderer/renderer_server.cc b/src/renderer/renderer_server.cc index d03ba0c99..724ff5ac0 100644 --- a/src/renderer/renderer_server.cc +++ b/src/renderer/renderer_server.cc @@ -34,9 +34,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" -#include "protocol/renderer_command.pb.h" #include "absl/flags/flag.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -49,6 +46,9 @@ #include "ipc/ipc.h" #include "ipc/named_event.h" #include "ipc/process_watch_dog.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" +#include "protocol/renderer_command.pb.h" #include "renderer/renderer_interface.h" #ifdef _WIN32 diff --git a/src/renderer/renderer_server_test.cc b/src/renderer/renderer_server_test.cc index 9fc99382b..38fa0a8d6 100644 --- a/src/renderer/renderer_server_test.cc +++ b/src/renderer/renderer_server_test.cc @@ -32,12 +32,12 @@ #include #include -#include "protocol/renderer_command.pb.h" #include "absl/strings/string_view.h" #include "absl/time/clock.h" #include "absl/time/time.h" #include "base/logging.h" #include "ipc/ipc_test_util.h" +#include "protocol/renderer_command.pb.h" #include "renderer/renderer_client.h" #include "renderer/renderer_interface.h" #include "testing/gunit.h" diff --git a/src/renderer/renderer_style_handler.cc b/src/renderer/renderer_style_handler.cc index a066a2917..b29c52016 100644 --- a/src/renderer/renderer_style_handler.cc +++ b/src/renderer/renderer_style_handler.cc @@ -38,8 +38,8 @@ #endif // _WIN32 // clang-format on -#include "protocol/renderer_style.pb.h" #include "base/singleton.h" +#include "protocol/renderer_style.pb.h" namespace mozc { namespace renderer { diff --git a/src/renderer/win32/candidate_window.cc b/src/renderer/win32/candidate_window.cc index b92cad07b..8518c66d3 100644 --- a/src/renderer/win32/candidate_window.cc +++ b/src/renderer/win32/candidate_window.cc @@ -34,12 +34,12 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/renderer_command.pb.h" #include "base/coordinates.h" #include "base/logging.h" #include "base/util.h" #include "client/client_interface.h" +#include "protocol/candidates.pb.h" +#include "protocol/renderer_command.pb.h" #include "renderer/renderer_style_handler.h" #include "renderer/table_layout.h" #include "renderer/win32/resource.h" diff --git a/src/renderer/win32/candidate_window.h b/src/renderer/win32/candidate_window.h index be63ca1ca..492783680 100644 --- a/src/renderer/win32/candidate_window.h +++ b/src/renderer/win32/candidate_window.h @@ -43,11 +43,11 @@ #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "base/const.h" #include "base/coordinates.h" #include "client/client_interface.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" #include "renderer/table_layout.h" #include "renderer/win32/text_renderer.h" diff --git a/src/renderer/win32/indicator_window.cc b/src/renderer/win32/indicator_window.cc index d9f26c46e..5c885b2fa 100644 --- a/src/renderer/win32/indicator_window.cc +++ b/src/renderer/win32/indicator_window.cc @@ -42,11 +42,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/renderer_command.pb.h" #include "base/const.h" #include "base/logging.h" #include "base/util.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_command.pb.h" #include "renderer/win32/win32_image_util.h" #include "renderer/win32/win32_renderer_util.h" diff --git a/src/renderer/win32/indicator_window.h b/src/renderer/win32/indicator_window.h index 02c538d09..f23dd9e3c 100644 --- a/src/renderer/win32/indicator_window.h +++ b/src/renderer/win32/indicator_window.h @@ -32,8 +32,8 @@ #include -#include "protocol/renderer_command.pb.h" #include "base/coordinates.h" +#include "protocol/renderer_command.pb.h" #include "renderer/win32/win32_renderer_util.h" namespace mozc { diff --git a/src/renderer/win32/infolist_window.cc b/src/renderer/win32/infolist_window.cc index a9abe8e61..a772e7250 100644 --- a/src/renderer/win32/infolist_window.cc +++ b/src/renderer/win32/infolist_window.cc @@ -33,14 +33,14 @@ #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/renderer_command.pb.h" -#include "protocol/renderer_style.pb.h" #include "base/coordinates.h" #include "base/logging.h" #include "base/util.h" #include "client/client_interface.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_command.pb.h" +#include "protocol/renderer_style.pb.h" #include "renderer/renderer_style_handler.h" #include "renderer/win32/text_renderer.h" diff --git a/src/renderer/win32/infolist_window.h b/src/renderer/win32/infolist_window.h index 78bf5304c..f25ca3f76 100644 --- a/src/renderer/win32/infolist_window.h +++ b/src/renderer/win32/infolist_window.h @@ -44,11 +44,11 @@ #include #include -#include "protocol/renderer_command.pb.h" -#include "protocol/renderer_style.pb.h" #include "base/const.h" #include "base/coordinates.h" #include "client/client_interface.h" +#include "protocol/renderer_command.pb.h" +#include "protocol/renderer_style.pb.h" #include "renderer/win32/text_renderer.h" namespace mozc { diff --git a/src/renderer/win32/text_renderer.cc b/src/renderer/win32/text_renderer.cc index bb4fe09c1..5f40e019a 100644 --- a/src/renderer/win32/text_renderer.cc +++ b/src/renderer/win32/text_renderer.cc @@ -44,9 +44,9 @@ #include #include -#include "protocol/renderer_style.pb.h" #include "absl/types/span.h" #include "base/logging.h" +#include "protocol/renderer_style.pb.h" #include "renderer/renderer_style_handler.h" namespace mozc { diff --git a/src/renderer/win32/win32_renderer_client.cc b/src/renderer/win32/win32_renderer_client.cc index 0e4a7003a..df3393704 100644 --- a/src/renderer/win32/win32_renderer_client.cc +++ b/src/renderer/win32/win32_renderer_client.cc @@ -36,12 +36,12 @@ #include #include -#include "protocol/renderer_command.pb.h" #include "absl/base/attributes.h" #include "absl/base/const_init.h" #include "absl/synchronization/mutex.h" #include "base/logging.h" #include "base/system_util.h" +#include "protocol/renderer_command.pb.h" #include "renderer/renderer_client.h" namespace mozc { diff --git a/src/renderer/win32/win32_renderer_util.cc b/src/renderer/win32/win32_renderer_util.cc index 7ce33ac4a..71416baec 100644 --- a/src/renderer/win32/win32_renderer_util.cc +++ b/src/renderer/win32/win32_renderer_util.cc @@ -42,9 +42,9 @@ #include #include -#include "protocol/renderer_command.pb.h" #include "base/logging.h" #include "base/win32/win_util.h" +#include "protocol/renderer_command.pb.h" namespace mozc { namespace renderer { diff --git a/src/renderer/win32/win32_renderer_util_test.cc b/src/renderer/win32/win32_renderer_util_test.cc index 3f181a6ff..1db933d3a 100644 --- a/src/renderer/win32/win32_renderer_util_test.cc +++ b/src/renderer/win32/win32_renderer_util_test.cc @@ -40,10 +40,10 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/renderer_command.pb.h" #include "absl/base/casts.h" #include "base/logging.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_command.pb.h" #include "testing/gunit.h" // Following functions should be placed in global namespace for Koenig look-up diff --git a/src/renderer/win32/win32_server.cc b/src/renderer/win32/win32_server.cc index 4c7090c62..daad8e7e9 100644 --- a/src/renderer/win32/win32_server.cc +++ b/src/renderer/win32/win32_server.cc @@ -33,12 +33,12 @@ #include -#include "protocol/renderer_command.pb.h" #include "absl/strings/string_view.h" #include "absl/synchronization/mutex.h" #include "base/logging.h" #include "base/run_level.h" #include "base/util.h" +#include "protocol/renderer_command.pb.h" #include "renderer/win32/window_manager.h" namespace mozc { diff --git a/src/renderer/win32/window_manager.cc b/src/renderer/win32/window_manager.cc index 2c104f028..61a30843a 100644 --- a/src/renderer/win32/window_manager.cc +++ b/src/renderer/win32/window_manager.cc @@ -34,11 +34,11 @@ #include #include +#include "base/coordinates.h" +#include "base/logging.h" #include "protocol/candidates.pb.h" #include "protocol/commands.pb.h" #include "protocol/renderer_command.pb.h" -#include "base/coordinates.h" -#include "base/logging.h" #include "renderer/win32/candidate_window.h" #include "renderer/win32/indicator_window.h" #include "renderer/win32/infolist_window.h" diff --git a/src/renderer/win32/window_manager.h b/src/renderer/win32/window_manager.h index e1ee5b6ae..940cd6559 100644 --- a/src/renderer/win32/window_manager.h +++ b/src/renderer/win32/window_manager.h @@ -34,8 +34,8 @@ #include -#include "protocol/renderer_command.pb.h" #include "client/client_interface.h" +#include "protocol/renderer_command.pb.h" #include "renderer/win32/candidate_window.h" #include "renderer/win32/indicator_window.h" #include "renderer/win32/infolist_window.h" diff --git a/src/request/conversion_request.h b/src/request/conversion_request.h index acdd1f646..c68b88e83 100644 --- a/src/request/conversion_request.h +++ b/src/request/conversion_request.h @@ -32,11 +32,11 @@ #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "base/logging.h" #include "composer/composer.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { inline constexpr size_t kMaxConversionCandidatesSize = 200; diff --git a/src/request/request.gyp b/src/request/request.gyp index a1b99772e..2397c5f07 100644 --- a/src/request/request.gyp +++ b/src/request/request.gyp @@ -37,8 +37,8 @@ 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', ], }, ], diff --git a/src/rewriter/a11y_description_rewriter.cc b/src/rewriter/a11y_description_rewriter.cc index e4d0107c2..70f33de62 100644 --- a/src/rewriter/a11y_description_rewriter.cc +++ b/src/rewriter/a11y_description_rewriter.cc @@ -34,10 +34,10 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "base/util.h" #include "data_manager/serialized_dictionary.h" +#include "protocol/commands.pb.h" namespace mozc { namespace { diff --git a/src/rewriter/a11y_description_rewriter_test.cc b/src/rewriter/a11y_description_rewriter_test.cc index f7ad8c4c2..de9b90b35 100644 --- a/src/rewriter/a11y_description_rewriter_test.cc +++ b/src/rewriter/a11y_description_rewriter_test.cc @@ -32,10 +32,10 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "data_manager/data_manager.h" #include "data_manager/testing/mock_data_manager.h" +#include "protocol/commands.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/rewriter/calculator_rewriter.cc b/src/rewriter/calculator_rewriter.cc index 979a5c8d2..92a5d168c 100644 --- a/src/rewriter/calculator_rewriter.cc +++ b/src/rewriter/calculator_rewriter.cc @@ -32,8 +32,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_replace.h" #include "absl/strings/string_view.h" @@ -42,6 +40,8 @@ #include "base/util.h" #include "converter/converter_interface.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/calculator/calculator_interface.h" diff --git a/src/rewriter/calculator_rewriter_test.cc b/src/rewriter/calculator_rewriter_test.cc index 241be4833..91500ee83 100644 --- a/src/rewriter/calculator_rewriter_test.cc +++ b/src/rewriter/calculator_rewriter_test.cc @@ -32,8 +32,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "base/logging.h" @@ -43,6 +41,8 @@ #include "converter/segments_matchers.h" #include "engine/engine_interface.h" #include "engine/mock_data_engine_factory.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/calculator/calculator_interface.h" #include "rewriter/calculator/calculator_mock.h" diff --git a/src/rewriter/command_rewriter.cc b/src/rewriter/command_rewriter.cc index 4e113afb7..9db2fec1b 100644 --- a/src/rewriter/command_rewriter.cc +++ b/src/rewriter/command_rewriter.cc @@ -33,12 +33,12 @@ #include #include -#include "protocol/config.pb.h" #include "absl/algorithm/container.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "base/logging.h" #include "converter/segments.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/rewriter/command_rewriter.h b/src/rewriter/command_rewriter.h index 209775d47..0a8ab39ab 100644 --- a/src/rewriter/command_rewriter.h +++ b/src/rewriter/command_rewriter.h @@ -30,8 +30,8 @@ #ifndef MOZC_REWRITER_COMMAND_REWRITER_H_ #define MOZC_REWRITER_COMMAND_REWRITER_H_ -#include "protocol/config.pb.h" #include "converter/segments.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" diff --git a/src/rewriter/command_rewriter_test.cc b/src/rewriter/command_rewriter_test.cc index 1d3340216..c0445bcdc 100644 --- a/src/rewriter/command_rewriter_test.cc +++ b/src/rewriter/command_rewriter_test.cc @@ -31,10 +31,10 @@ #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "config/config_handler.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/correction_rewriter.cc b/src/rewriter/correction_rewriter.cc index 3eb162e1c..2de4aef56 100644 --- a/src/rewriter/correction_rewriter.cc +++ b/src/rewriter/correction_rewriter.cc @@ -34,12 +34,12 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "converter/segments.h" #include "data_manager/data_manager_interface.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/rewriter/correction_rewriter_test.cc b/src/rewriter/correction_rewriter_test.cc index a937f1585..461577836 100644 --- a/src/rewriter/correction_rewriter_test.cc +++ b/src/rewriter/correction_rewriter_test.cc @@ -34,12 +34,12 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/container/serialized_string_array.h" #include "config/config_handler.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" diff --git a/src/rewriter/date_rewriter.cc b/src/rewriter/date_rewriter.cc index e8027efb7..40d35ba03 100644 --- a/src/rewriter/date_rewriter.cc +++ b/src/rewriter/date_rewriter.cc @@ -47,8 +47,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/match.h" #include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" @@ -66,6 +64,8 @@ #include "converter/segments.h" #include "dictionary/dictionary_interface.h" #include "dictionary/dictionary_token.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" diff --git a/src/rewriter/date_rewriter_test.cc b/src/rewriter/date_rewriter_test.cc index 507a33857..a20b047c3 100644 --- a/src/rewriter/date_rewriter_test.cc +++ b/src/rewriter/date_rewriter_test.cc @@ -37,8 +37,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/clock.h" #include "base/clock_mock.h" @@ -47,6 +45,8 @@ #include "converter/segments.h" #include "converter/segments_matchers.h" #include "dictionary/dictionary_mock.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gmock.h" #include "testing/gunit.h" diff --git a/src/rewriter/emoji_rewriter.cc b/src/rewriter/emoji_rewriter.cc index 06331744e..c8ff2ece5 100644 --- a/src/rewriter/emoji_rewriter.cc +++ b/src/rewriter/emoji_rewriter.cc @@ -37,8 +37,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -46,6 +44,8 @@ #include "base/logging.h" #include "base/strings/assign.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_util.h" #include "usage_stats/usage_stats.h" diff --git a/src/rewriter/emoji_rewriter_test.cc b/src/rewriter/emoji_rewriter_test.cc index b7dc2b1b2..761b6e56c 100644 --- a/src/rewriter/emoji_rewriter_test.cc +++ b/src/rewriter/emoji_rewriter_test.cc @@ -35,8 +35,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/btree_map.h" #include "absl/strings/string_view.h" #include "base/container/serialized_string_array.h" @@ -46,6 +44,8 @@ #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/variants_rewriter.h" #include "testing/gunit.h" diff --git a/src/rewriter/emoticon_rewriter.cc b/src/rewriter/emoticon_rewriter.cc index d087e3cfc..cd84d5ec3 100644 --- a/src/rewriter/emoticon_rewriter.cc +++ b/src/rewriter/emoticon_rewriter.cc @@ -37,13 +37,13 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/random/random.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "converter/segments.h" #include "data_manager/serialized_dictionary.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" #include "rewriter/rewriter_util.h" diff --git a/src/rewriter/emoticon_rewriter_test.cc b/src/rewriter/emoticon_rewriter_test.cc index c78048879..ee9c1b7e5 100644 --- a/src/rewriter/emoticon_rewriter_test.cc +++ b/src/rewriter/emoticon_rewriter_test.cc @@ -33,14 +33,14 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "config/config_handler.h" #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" #include "testing/gunit.h" diff --git a/src/rewriter/english_variants_rewriter.cc b/src/rewriter/english_variants_rewriter.cc index 7fb4f874d..a2d9564dd 100644 --- a/src/rewriter/english_variants_rewriter.cc +++ b/src/rewriter/english_variants_rewriter.cc @@ -33,7 +33,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -41,6 +40,7 @@ #include "base/logging.h" #include "base/util.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/rewriter/english_variants_rewriter_test.cc b/src/rewriter/english_variants_rewriter_test.cc index df9e01887..239ddf9bb 100644 --- a/src/rewriter/english_variants_rewriter_test.cc +++ b/src/rewriter/english_variants_rewriter_test.cc @@ -34,11 +34,11 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/environmental_filter_rewriter.cc b/src/rewriter/environmental_filter_rewriter.cc index 8a1718bde..f88b42963 100644 --- a/src/rewriter/environmental_filter_rewriter.cc +++ b/src/rewriter/environmental_filter_rewriter.cc @@ -40,7 +40,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" #include "base/container/serialized_string_array.h" @@ -51,6 +50,7 @@ #include "converter/segments.h" #include "data_manager/data_manager_interface.h" #include "data_manager/emoji_data.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" diff --git a/src/rewriter/environmental_filter_rewriter_test.cc b/src/rewriter/environmental_filter_rewriter_test.cc index b953edb65..6164a4cfa 100644 --- a/src/rewriter/environmental_filter_rewriter_test.cc +++ b/src/rewriter/environmental_filter_rewriter_test.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/btree_map.h" #include "absl/strings/string_view.h" #include "base/text_normalizer.h" @@ -43,6 +42,7 @@ #include "converter/segments.h" #include "data_manager/emoji_data.h" #include "data_manager/testing/mock_data_manager.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/language_aware_rewriter.cc b/src/rewriter/language_aware_rewriter.cc index 37df0706d..f222989e7 100644 --- a/src/rewriter/language_aware_rewriter.cc +++ b/src/rewriter/language_aware_rewriter.cc @@ -33,8 +33,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "base/japanese_util.h" #include "base/logging.h" #include "base/util.h" @@ -43,6 +41,8 @@ #include "converter/segments.h" #include "dictionary/dictionary_interface.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "usage_stats/usage_stats.h" diff --git a/src/rewriter/language_aware_rewriter_test.cc b/src/rewriter/language_aware_rewriter_test.cc index 91a8b9950..da0fdb0a2 100644 --- a/src/rewriter/language_aware_rewriter_test.cc +++ b/src/rewriter/language_aware_rewriter_test.cc @@ -31,8 +31,6 @@ #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "composer/composer.h" #include "composer/table.h" @@ -41,6 +39,8 @@ #include "data_manager/testing/mock_data_manager.h" #include "dictionary/dictionary_mock.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/merger_rewriter.h b/src/rewriter/merger_rewriter.h index 6987288e9..c10044493 100644 --- a/src/rewriter/merger_rewriter.h +++ b/src/rewriter/merger_rewriter.h @@ -34,10 +34,10 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "config/config_handler.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" diff --git a/src/rewriter/merger_rewriter_test.cc b/src/rewriter/merger_rewriter_test.cc index d53d0d431..60cfec496 100644 --- a/src/rewriter/merger_rewriter_test.cc +++ b/src/rewriter/merger_rewriter_test.cc @@ -32,9 +32,9 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "converter/segments.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/number_rewriter.cc b/src/rewriter/number_rewriter.cc index f51329dfa..bbdd1bc2d 100644 --- a/src/rewriter/number_rewriter.cc +++ b/src/rewriter/number_rewriter.cc @@ -37,8 +37,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" @@ -51,6 +49,8 @@ #include "converter/segments.h" #include "data_manager/data_manager_interface.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/number_compound_util.h" #include "rewriter/rewriter_interface.h" diff --git a/src/rewriter/number_rewriter_test.cc b/src/rewriter/number_rewriter_test.cc index bdb31d693..62d9a8024 100644 --- a/src/rewriter/number_rewriter_test.cc +++ b/src/rewriter/number_rewriter_test.cc @@ -34,7 +34,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" @@ -47,6 +46,7 @@ #include "converter/segments_matchers.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" #include "session/request_test_util.h" diff --git a/src/rewriter/remove_redundant_candidate_rewriter.cc b/src/rewriter/remove_redundant_candidate_rewriter.cc index 21dd5d381..fc48c4b0c 100644 --- a/src/rewriter/remove_redundant_candidate_rewriter.cc +++ b/src/rewriter/remove_redundant_candidate_rewriter.cc @@ -29,8 +29,8 @@ #include "rewriter/remove_redundant_candidate_rewriter.h" -#include "protocol/commands.pb.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" diff --git a/src/rewriter/remove_redundant_candidate_rewriter_test.cc b/src/rewriter/remove_redundant_candidate_rewriter_test.cc index af1a67a6e..e12ee2b64 100644 --- a/src/rewriter/remove_redundant_candidate_rewriter_test.cc +++ b/src/rewriter/remove_redundant_candidate_rewriter_test.cc @@ -29,8 +29,8 @@ #include "rewriter/remove_redundant_candidate_rewriter.h" -#include "protocol/commands.pb.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" diff --git a/src/rewriter/rewriter.gyp b/src/rewriter/rewriter.gyp index 8eb0eed9f..8ec49fb54 100644 --- a/src/rewriter/rewriter.gyp +++ b/src/rewriter/rewriter.gyp @@ -95,8 +95,8 @@ '<(mozc_oss_src_dir)/data_manager/data_manager_base.gyp:serialized_dictionary', '<(mozc_oss_src_dir)/dictionary/dictionary.gyp:dictionary', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', '<(mozc_oss_src_dir)/storage/storage.gyp:storage', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', diff --git a/src/rewriter/rewriter_test.gyp b/src/rewriter/rewriter_test.gyp index cfe43a76a..56f5ef9a2 100644 --- a/src/rewriter/rewriter_test.gyp +++ b/src/rewriter/rewriter_test.gyp @@ -82,7 +82,7 @@ '<(mozc_oss_src_dir)/data_manager/testing/mock_data_manager.gyp:mock_data_manager', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:user_pos', '<(mozc_oss_src_dir)/engine/engine.gyp:mock_data_engine_factory', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', @@ -126,8 +126,8 @@ '<(mozc_oss_src_dir)/converter/converter_base.gyp:segments', '<(mozc_oss_src_dir)/data_manager/testing/mock_data_manager.gyp:mock_data_manager', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:pos_matcher', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', @@ -148,7 +148,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/composer/composer.gyp:composer', '<(mozc_oss_src_dir)/data_manager/testing/mock_data_manager.gyp:mock_data_manager', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:request_test_util', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', diff --git a/src/rewriter/single_kanji_rewriter.cc b/src/rewriter/single_kanji_rewriter.cc index c6f9e4344..ce42976f0 100644 --- a/src/rewriter/single_kanji_rewriter.cc +++ b/src/rewriter/single_kanji_rewriter.cc @@ -34,8 +34,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "base/strings/assign.h" @@ -43,6 +41,8 @@ #include "data_manager/serialized_dictionary.h" #include "dictionary/pos_matcher.h" #include "dictionary/single_kanji_dictionary.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" #include "rewriter/rewriter_util.h" diff --git a/src/rewriter/single_kanji_rewriter_test.cc b/src/rewriter/single_kanji_rewriter_test.cc index a4f154ae5..fae310b51 100644 --- a/src/rewriter/single_kanji_rewriter_test.cc +++ b/src/rewriter/single_kanji_rewriter_test.cc @@ -33,12 +33,12 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gunit.h" diff --git a/src/rewriter/small_letter_rewriter.cc b/src/rewriter/small_letter_rewriter.cc index b8dbbba79..49c62af5c 100644 --- a/src/rewriter/small_letter_rewriter.cc +++ b/src/rewriter/small_letter_rewriter.cc @@ -32,7 +32,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/ascii.h" #include "absl/strings/str_cat.h" @@ -40,6 +39,7 @@ #include "base/util.h" #include "converter/converter_interface.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/rewriter/small_letter_rewriter_test.cc b/src/rewriter/small_letter_rewriter_test.cc index afde344fe..fd308bad7 100644 --- a/src/rewriter/small_letter_rewriter_test.cc +++ b/src/rewriter/small_letter_rewriter_test.cc @@ -31,11 +31,11 @@ #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/strings/assign.h" #include "engine/mock_data_engine_factory.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/symbol_rewriter.cc b/src/rewriter/symbol_rewriter.cc index 2fd0425a4..7fb83fcbb 100644 --- a/src/rewriter/symbol_rewriter.cc +++ b/src/rewriter/symbol_rewriter.cc @@ -36,8 +36,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "base/japanese_util.h" @@ -47,6 +45,8 @@ #include "converter/segments.h" #include "data_manager/data_manager_interface.h" #include "data_manager/serialized_dictionary.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" #include "rewriter/rewriter_util.h" diff --git a/src/rewriter/symbol_rewriter_test.cc b/src/rewriter/symbol_rewriter_test.cc index b70d82dad..5116a2d01 100644 --- a/src/rewriter/symbol_rewriter_test.cc +++ b/src/rewriter/symbol_rewriter_test.cc @@ -32,7 +32,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "base/util.h" @@ -41,6 +40,7 @@ #include "data_manager/testing/mock_data_manager.h" #include "engine/engine_interface.h" #include "engine/mock_data_engine_factory.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "session/request_test_util.h" #include "testing/gmock.h" diff --git a/src/rewriter/t13n_promotion_rewriter.cc b/src/rewriter/t13n_promotion_rewriter.cc index 84f22e4d8..17bd26af1 100644 --- a/src/rewriter/t13n_promotion_rewriter.cc +++ b/src/rewriter/t13n_promotion_rewriter.cc @@ -32,12 +32,12 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/string_view.h" #include "base/util.h" #include "composer/composer.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_util.h" #include "transliteration/transliteration.h" diff --git a/src/rewriter/t13n_promotion_rewriter_test.cc b/src/rewriter/t13n_promotion_rewriter_test.cc index b480307e0..699fffd34 100644 --- a/src/rewriter/t13n_promotion_rewriter_test.cc +++ b/src/rewriter/t13n_promotion_rewriter_test.cc @@ -32,12 +32,12 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "composer/composer.h" #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "rewriter/transliteration_rewriter.h" #include "session/request_test_util.h" diff --git a/src/rewriter/transliteration_rewriter.cc b/src/rewriter/transliteration_rewriter.cc index 1b60019ee..c77a5be0d 100644 --- a/src/rewriter/transliteration_rewriter.cc +++ b/src/rewriter/transliteration_rewriter.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "base/japanese_util.h" #include "base/logging.h" @@ -45,6 +44,7 @@ #include "composer/composer.h" #include "converter/segments.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" // For T13n normalize #include "transliteration/transliteration.h" diff --git a/src/rewriter/transliteration_rewriter_test.cc b/src/rewriter/transliteration_rewriter_test.cc index 0b9b97920..a478bc2fa 100644 --- a/src/rewriter/transliteration_rewriter_test.cc +++ b/src/rewriter/transliteration_rewriter_test.cc @@ -35,8 +35,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "base/logging.h" @@ -46,6 +44,8 @@ #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/unicode_rewriter_test.cc b/src/rewriter/unicode_rewriter_test.cc index e93f19c7e..6827a42ef 100644 --- a/src/rewriter/unicode_rewriter_test.cc +++ b/src/rewriter/unicode_rewriter_test.cc @@ -36,14 +36,14 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" #include "composer/composer.h" #include "converter/segments.h" #include "engine/engine_interface.h" #include "engine/mock_data_engine_factory.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/usage_rewriter.cc b/src/rewriter/usage_rewriter.cc index 9e743a498..16e72d8a1 100644 --- a/src/rewriter/usage_rewriter.cc +++ b/src/rewriter/usage_rewriter.cc @@ -35,7 +35,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" #include "base/container/serialized_string_array.h" @@ -45,6 +44,7 @@ #include "data_manager/data_manager_interface.h" #include "dictionary/dictionary_interface.h" #include "dictionary/pos_matcher.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/usage_rewriter.h" diff --git a/src/rewriter/usage_rewriter_test.cc b/src/rewriter/usage_rewriter_test.cc index 68ae4c3c8..c238d8a62 100644 --- a/src/rewriter/usage_rewriter_test.cc +++ b/src/rewriter/usage_rewriter_test.cc @@ -34,8 +34,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "config/config_handler.h" #include "converter/segments.h" @@ -45,6 +43,8 @@ #include "dictionary/user_dictionary.h" #include "dictionary/user_dictionary_storage.h" #include "dictionary/user_pos.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/user_boundary_history_rewriter.cc b/src/rewriter/user_boundary_history_rewriter.cc index e12bde9e6..d12ab0ddf 100644 --- a/src/rewriter/user_boundary_history_rewriter.cc +++ b/src/rewriter/user_boundary_history_rewriter.cc @@ -36,7 +36,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -46,6 +45,7 @@ #include "base/util.h" #include "converter/converter_interface.h" #include "converter/segments.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "storage/lru_storage.h" #include "usage_stats/usage_stats.h" diff --git a/src/rewriter/user_boundary_history_rewriter_test.cc b/src/rewriter/user_boundary_history_rewriter_test.cc index eed1a55cb..05f8422f7 100644 --- a/src/rewriter/user_boundary_history_rewriter_test.cc +++ b/src/rewriter/user_boundary_history_rewriter_test.cc @@ -31,7 +31,6 @@ #include -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "base/file_util.h" @@ -39,6 +38,7 @@ #include "config/config_handler.h" #include "converter/converter_mock.h" #include "converter/segments.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gmock.h" #include "testing/gunit.h" diff --git a/src/rewriter/user_segment_history_rewriter.cc b/src/rewriter/user_segment_history_rewriter.cc index 702af6e58..2f8032d8f 100644 --- a/src/rewriter/user_segment_history_rewriter.cc +++ b/src/rewriter/user_segment_history_rewriter.cc @@ -39,7 +39,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/container/btree_set.h" #include "absl/status/status.h" #include "absl/strings/str_cat.h" @@ -55,6 +54,7 @@ #include "converter/segments.h" #include "dictionary/pos_group.h" #include "dictionary/pos_matcher.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/variants_rewriter.h" #include "storage/lru_storage.h" diff --git a/src/rewriter/user_segment_history_rewriter_test.cc b/src/rewriter/user_segment_history_rewriter_test.cc index 2b1846d67..eb0632243 100644 --- a/src/rewriter/user_segment_history_rewriter_test.cc +++ b/src/rewriter/user_segment_history_rewriter_test.cc @@ -34,7 +34,6 @@ #include #include -#include "protocol/config.pb.h" #include "absl/random/random.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" @@ -51,6 +50,7 @@ #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_group.h" #include "dictionary/pos_matcher.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/number_rewriter.h" #include "rewriter/variants_rewriter.h" diff --git a/src/rewriter/variants_rewriter.cc b/src/rewriter/variants_rewriter.cc index 2f0ae0160..10d9d3082 100644 --- a/src/rewriter/variants_rewriter.cc +++ b/src/rewriter/variants_rewriter.cc @@ -34,7 +34,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/match.h" #include "absl/strings/str_join.h" #include "absl/strings/str_replace.h" @@ -46,6 +45,7 @@ #include "config/character_form_manager.h" #include "converter/segments.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/rewriter/variants_rewriter_test.cc b/src/rewriter/variants_rewriter_test.cc index 9534cc3ab..5d1539cca 100644 --- a/src/rewriter/variants_rewriter_test.cc +++ b/src/rewriter/variants_rewriter_test.cc @@ -32,8 +32,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "base/japanese_util.h" @@ -42,6 +40,8 @@ #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/version_rewriter.h b/src/rewriter/version_rewriter.h index 2757a9540..4422ec40b 100644 --- a/src/rewriter/version_rewriter.h +++ b/src/rewriter/version_rewriter.h @@ -32,10 +32,10 @@ #include -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/string_view.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "rewriter/rewriter_interface.h" diff --git a/src/rewriter/version_rewriter_test.cc b/src/rewriter/version_rewriter_test.cc index cc4168fa1..a5f3520bf 100644 --- a/src/rewriter/version_rewriter_test.cc +++ b/src/rewriter/version_rewriter_test.cc @@ -33,10 +33,10 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/rewriter/zipcode_rewriter.cc b/src/rewriter/zipcode_rewriter.cc index c2488f028..83a870c5b 100644 --- a/src/rewriter/zipcode_rewriter.cc +++ b/src/rewriter/zipcode_rewriter.cc @@ -33,12 +33,12 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "converter/segments.h" #include "dictionary/pos_matcher.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" namespace mozc { diff --git a/src/rewriter/zipcode_rewriter_test.cc b/src/rewriter/zipcode_rewriter_test.cc index 0645a33c7..2e1ec2d94 100644 --- a/src/rewriter/zipcode_rewriter_test.cc +++ b/src/rewriter/zipcode_rewriter_test.cc @@ -32,12 +32,12 @@ #include #include -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "converter/segments.h" #include "data_manager/testing/mock_data_manager.h" #include "dictionary/pos_matcher.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/server/mozc_rpc_server_main.cc b/src/server/mozc_rpc_server_main.cc index d635ad875..5a180e6d9 100644 --- a/src/server/mozc_rpc_server_main.cc +++ b/src/server/mozc_rpc_server_main.cc @@ -47,13 +47,13 @@ using ssize_t = SSIZE_T; #include #include -#include "protocol/commands.pb.h" #include "absl/flags/flag.h" #include "base/init_mozc.h" #include "base/protobuf/message.h" #include "base/singleton.h" #include "base/system_util.h" #include "engine/engine_factory.h" +#include "protocol/commands.pb.h" #include "session/random_keyevents_generator.h" #include "session/session_handler.h" #include "session/session_usage_observer.h" diff --git a/src/server/server.gyp b/src/server/server.gyp index 6fc61d6f0..a5b7187e3 100644 --- a/src/server/server.gyp +++ b/src/server/server.gyp @@ -102,7 +102,7 @@ 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:crash_report_handler', '<(mozc_oss_src_dir)/session/session.gyp:session_server', - '<(mozc_src_dir)/protocol/protocol.gyp:state_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:state_proto', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', ], }, diff --git a/src/session/internal/ime_context.cc b/src/session/internal/ime_context.cc index 26fd2c09a..b5ac43f2d 100644 --- a/src/session/internal/ime_context.cc +++ b/src/session/internal/ime_context.cc @@ -32,9 +32,9 @@ #include "session/internal/ime_context.h" -#include "protocol/commands.pb.h" #include "base/logging.h" #include "composer/composer.h" +#include "protocol/commands.pb.h" #include "session/internal/keymap.h" #include "session/session_converter_interface.h" diff --git a/src/session/internal/ime_context.h b/src/session/internal/ime_context.h index 97fea997b..2ae7d2941 100644 --- a/src/session/internal/ime_context.h +++ b/src/session/internal/ime_context.h @@ -36,11 +36,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/time/time.h" #include "composer/composer.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/key_event_transformer.h" #include "session/internal/keymap.h" #include "session/session_converter_interface.h" diff --git a/src/session/internal/ime_context_test.cc b/src/session/internal/ime_context_test.cc index 57b1a1b9e..428e08f69 100644 --- a/src/session/internal/ime_context_test.cc +++ b/src/session/internal/ime_context_test.cc @@ -32,14 +32,14 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/time/time.h" #include "composer/composer.h" #include "composer/table.h" #include "converter/converter_interface.h" #include "converter/converter_mock.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/session_converter.h" #include "testing/gunit.h" #include "testing/testing_util.h" diff --git a/src/session/internal/key_event_transformer.cc b/src/session/internal/key_event_transformer.cc index 3f1738828..e5fc406c7 100644 --- a/src/session/internal/key_event_transformer.cc +++ b/src/session/internal/key_event_transformer.cc @@ -32,12 +32,12 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "base/japanese_util.h" #include "base/logging.h" #include "composer/key_event_util.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { namespace session { diff --git a/src/session/internal/key_event_transformer.h b/src/session/internal/key_event_transformer.h index cfd35e239..5669066c6 100644 --- a/src/session/internal/key_event_transformer.h +++ b/src/session/internal/key_event_transformer.h @@ -35,10 +35,10 @@ #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "base/singleton.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { namespace session { diff --git a/src/session/internal/key_event_transformer_test.cc b/src/session/internal/key_event_transformer_test.cc index a3135dadd..957fc16af 100644 --- a/src/session/internal/key_event_transformer_test.cc +++ b/src/session/internal/key_event_transformer_test.cc @@ -32,10 +32,10 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/str_cat.h" #include "base/singleton.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/session/internal/keymap.cc b/src/session/internal/keymap.cc index ac4d845ff..037b07eae 100644 --- a/src/session/internal/keymap.cc +++ b/src/session/internal/keymap.cc @@ -40,8 +40,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "absl/strings/str_split.h" @@ -51,6 +49,8 @@ #include "base/util.h" #include "composer/key_parser.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" namespace mozc { namespace keymap { diff --git a/src/session/internal/keymap.h b/src/session/internal/keymap.h index 4c8ff3189..8e5d50f4a 100644 --- a/src/session/internal/keymap.h +++ b/src/session/internal/keymap.h @@ -36,12 +36,12 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/container/flat_hash_set.h" #include "base/protobuf/protobuf.h" #include "composer/key_event_util.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit_prod.h" namespace mozc { diff --git a/src/session/internal/keymap_test.cc b/src/session/internal/keymap_test.cc index feb48e070..75fc75073 100644 --- a/src/session/internal/keymap_test.cc +++ b/src/session/internal/keymap_test.cc @@ -37,11 +37,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_set.h" #include "base/config_file_stream.h" #include "composer/key_parser.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/session/internal/session_output.cc b/src/session/internal/session_output.cc index 35cc6ee23..511ad588d 100644 --- a/src/session/internal/session_output.cc +++ b/src/session/internal/session_output.cc @@ -38,8 +38,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_map.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" @@ -50,6 +48,8 @@ #include "base/version.h" #include "composer/composer.h" #include "converter/segments.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" #include "session/internal/candidate_list.h" namespace mozc { diff --git a/src/session/internal/session_output.h b/src/session/internal/session_output.h index af4d5da8b..371aaf18c 100644 --- a/src/session/internal/session_output.h +++ b/src/session/internal/session_output.h @@ -36,11 +36,11 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "composer/composer.h" #include "converter/segments.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" #include "session/internal/candidate_list.h" namespace mozc { diff --git a/src/session/internal/session_output_test.cc b/src/session/internal/session_output_test.cc index 3d63fa5c1..1d9a3c22b 100644 --- a/src/session/internal/session_output_test.cc +++ b/src/session/internal/session_output_test.cc @@ -33,11 +33,11 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "base/text_normalizer.h" #include "base/util.h" #include "converter/segments.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" #include "session/internal/candidate_list.h" #include "testing/gunit.h" diff --git a/src/session/key_info_util.cc b/src/session/key_info_util.cc index bdcfe1336..6425e2d42 100644 --- a/src/session/key_info_util.cc +++ b/src/session/key_info_util.cc @@ -36,8 +36,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "base/config_file_stream.h" @@ -46,6 +44,8 @@ #include "composer/key_event_util.h" #include "composer/key_parser.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/keymap.h" namespace mozc { diff --git a/src/session/key_info_util.h b/src/session/key_info_util.h index c26b860e1..412c718b7 100644 --- a/src/session/key_info_util.h +++ b/src/session/key_info_util.h @@ -32,9 +32,9 @@ #include +#include "composer/key_event_util.h" #include "protocol/commands.pb.h" #include "protocol/config.pb.h" -#include "composer/key_event_util.h" namespace mozc { diff --git a/src/session/key_info_util_test.cc b/src/session/key_info_util_test.cc index 949370524..caa6b48d0 100644 --- a/src/session/key_info_util_test.cc +++ b/src/session/key_info_util_test.cc @@ -33,11 +33,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "composer/key_event_util.h" #include "composer/key_parser.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/session/random_keyevents_generator.cc b/src/session/random_keyevents_generator.cc index e2dddfa32..48e59a352 100644 --- a/src/session/random_keyevents_generator.cc +++ b/src/session/random_keyevents_generator.cc @@ -36,7 +36,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/random/distributions.h" #include "absl/random/random.h" #include "absl/strings/string_view.h" @@ -45,6 +44,7 @@ #include "base/logging.h" #include "base/util.h" #include "base/vlog.h" +#include "protocol/commands.pb.h" #include "session/session_stress_test_data.h" namespace mozc { diff --git a/src/session/random_keyevents_generator.h b/src/session/random_keyevents_generator.h index 6ff6ee9a7..a4817d06e 100644 --- a/src/session/random_keyevents_generator.h +++ b/src/session/random_keyevents_generator.h @@ -34,10 +34,10 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/random/random.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" +#include "protocol/commands.pb.h" namespace mozc { namespace session { diff --git a/src/session/session.cc b/src/session/session.cc index 8027193df..f627aae84 100644 --- a/src/session/session.cc +++ b/src/session/session.cc @@ -38,8 +38,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/strings/match.h" #include "absl/strings/string_view.h" @@ -53,6 +51,8 @@ #include "converter/segments.h" #include "engine/engine_interface.h" #include "engine/user_data_manager_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/ime_context.h" #include "session/internal/key_event_transformer.h" #include "session/internal/keymap.h" diff --git a/src/session/session.gyp b/src/session/session.gyp index 9664a8590..9699bf61e 100644 --- a/src/session/session.gyp +++ b/src/session/session.gyp @@ -47,8 +47,8 @@ '<(mozc_oss_src_dir)/composer/composer.gyp:key_parser', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/converter/converter_base.gyp:segments', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/request/request.gyp:conversion_request', '<(mozc_oss_src_dir)/transliteration/transliteration.gyp:transliteration', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', @@ -72,8 +72,8 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/composer/composer.gyp:composer', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', ], }, { @@ -104,10 +104,10 @@ '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/dictionary/dictionary_base.gyp:user_dictionary', '<(mozc_oss_src_dir)/engine/engine.gyp:engine_factory', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:engine_builder_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:engine_builder_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:user_dictionary_storage_proto', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', ':session_watch_dog', 'session_base.gyp:keymap', @@ -135,8 +135,8 @@ '<(mozc_oss_src_dir)/base/base.gyp:number_util', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/engine/engine.gyp:engine_factory', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', ], }, { @@ -151,7 +151,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/base/base.gyp:number_util', '<(mozc_oss_src_dir)/config/config.gyp:stats_config_util', - '<(mozc_src_dir)/protocol/protocol.gyp:state_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:state_proto', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats_protocol', ], @@ -167,8 +167,8 @@ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/engine/engine.gyp:engine_factory', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats_uploader', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:state_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:state_proto', 'session_handler', 'session_usage_observer', ], @@ -184,8 +184,8 @@ '<(mozc_oss_src_dir)/base/absl.gyp:absl_random', '<(mozc_oss_src_dir)/base/absl.gyp:absl_strings', '<(mozc_oss_src_dir)/base/base.gyp:japanese_util', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', 'gen_session_stress_test_data#host', 'session', ], diff --git a/src/session/session.h b/src/session/session.h index fe5f79040..cbd0d19f6 100644 --- a/src/session/session.h +++ b/src/session/session.h @@ -37,12 +37,12 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "composer/composer.h" #include "composer/table.h" #include "engine/engine_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/ime_context.h" #include "session/internal/keymap.h" #include "session/session_interface.h" diff --git a/src/session/session_base.gyp b/src/session/session_base.gyp index f34f2bbed..b104d1301 100644 --- a/src/session/session_base.gyp +++ b/src/session/session_base.gyp @@ -43,8 +43,8 @@ 'request_test_util.cc', ], 'dependencies': [ - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', ], }, { @@ -59,8 +59,8 @@ '<(mozc_oss_src_dir)/composer/composer.gyp:key_event_util', '<(mozc_oss_src_dir)/composer/composer.gyp:key_parser', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', ], }, { @@ -76,8 +76,8 @@ '<(mozc_oss_src_dir)/composer/composer.gyp:key_event_util', '<(mozc_oss_src_dir)/composer/composer.gyp:key_parser', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', 'keymap', ], }, @@ -91,7 +91,7 @@ '<(mozc_oss_src_dir)/base/absl.gyp:absl_strings', '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/protobuf/protobuf.gyp:protobuf', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', ], }, diff --git a/src/session/session_client_main.cc b/src/session/session_client_main.cc index 8e41042c1..0cd250b7d 100644 --- a/src/session/session_client_main.cc +++ b/src/session/session_client_main.cc @@ -33,7 +33,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/flags/flag.h" #include "absl/status/status.h" #include "base/file_stream.h" @@ -46,6 +45,7 @@ #include "composer/key_parser.h" #include "engine/engine_factory.h" #include "engine/engine_interface.h" +#include "protocol/commands.pb.h" #include "session/session.h" ABSL_FLAG(std::string, input, "", "Input file"); diff --git a/src/session/session_converter.cc b/src/session/session_converter.cc index 0c6a4a35c..fea480ee7 100644 --- a/src/session/session_converter.cc +++ b/src/session/session_converter.cc @@ -38,9 +38,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/flags/flag.h" #include "absl/strings/match.h" #include "absl/strings/str_cat.h" @@ -52,6 +49,9 @@ #include "composer/composer.h" #include "converter/converter_interface.h" #include "converter/segments.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/internal/candidate_list.h" #include "session/internal/session_output.h" diff --git a/src/session/session_converter.h b/src/session/session_converter.h index 039f7f770..152adbb4a 100644 --- a/src/session/session_converter.h +++ b/src/session/session_converter.h @@ -39,11 +39,11 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "converter/converter_interface.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/internal/candidate_list.h" #include "session/session_converter_interface.h" diff --git a/src/session/session_converter_interface.h b/src/session/session_converter_interface.h index 55095d3cc..3181b2c8f 100644 --- a/src/session/session_converter_interface.h +++ b/src/session/session_converter_interface.h @@ -35,12 +35,12 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "composer/composer.h" #include "converter/converter_interface.h" #include "converter/segments.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "transliteration/transliteration.h" namespace mozc { diff --git a/src/session/session_converter_stress_test.cc b/src/session/session_converter_stress_test.cc index 3d8f92108..9ff54abb4 100644 --- a/src/session/session_converter_stress_test.cc +++ b/src/session/session_converter_stress_test.cc @@ -32,8 +32,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/flags/flag.h" #include "base/random.h" #include "composer/composer.h" @@ -42,6 +40,8 @@ #include "converter/converter_interface.h" #include "engine/engine_interface.h" #include "engine/mock_data_engine_factory.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/session_converter.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/session/session_converter_test.cc b/src/session/session_converter_test.cc index 7e6c9e6fa..dbc34f7f6 100644 --- a/src/session/session_converter_test.cc +++ b/src/session/session_converter_test.cc @@ -43,9 +43,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "base/util.h" @@ -55,6 +52,9 @@ #include "converter/segments.h" #include "converter/segments_matchers.h" #include "data_manager/testing/mock_data_manager.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "session/internal/candidate_list.h" #include "session/request_test_util.h" diff --git a/src/session/session_handler.cc b/src/session/session_handler.cc index 6bf3b43af..0d017b9a0 100644 --- a/src/session/session_handler.cc +++ b/src/session/session_handler.cc @@ -40,10 +40,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" -#include "protocol/engine_builder.pb.h" -#include "protocol/user_dictionary_storage.pb.h" #include "absl/flags/flag.h" #include "absl/random/random.h" #include "absl/time/time.h" @@ -59,6 +55,10 @@ #include "engine/engine_builder.h" #include "engine/engine_interface.h" #include "engine/user_data_manager_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" +#include "protocol/engine_builder.pb.h" +#include "protocol/user_dictionary_storage.pb.h" #include "session/common.h" #include "session/internal/keymap.h" #include "session/session.h" diff --git a/src/session/session_handler.h b/src/session/session_handler.h index 0b4292e2c..8291dad26 100644 --- a/src/session/session_handler.h +++ b/src/session/session_handler.h @@ -37,8 +37,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/random/random.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" @@ -46,6 +44,8 @@ #include "dictionary/user_dictionary_session_handler.h" #include "engine/engine_builder.h" #include "engine/engine_interface.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/common.h" #include "session/internal/keymap.h" #include "session/session_handler_interface.h" diff --git a/src/session/session_handler_interface.h b/src/session/session_handler_interface.h index 06379fed3..8ccaa7db1 100644 --- a/src/session/session_handler_interface.h +++ b/src/session/session_handler_interface.h @@ -32,8 +32,8 @@ #ifndef MOZC_SESSION_SESSION_HANDLER_INTERFACE_H_ #define MOZC_SESSION_SESSION_HANDLER_INTERFACE_H_ -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" +#include "protocol/commands.pb.h" #include "session/session_observer_interface.h" namespace mozc { diff --git a/src/session/session_handler_main.cc b/src/session/session_handler_main.cc index 5e1d98c27..3d2466c91 100644 --- a/src/session/session_handler_main.cc +++ b/src/session/session_handler_main.cc @@ -64,14 +64,14 @@ SHOW_LOG_BY_VALUE ございました #include "base/init_mozc.h" #include "base/protobuf/message.h" #include "base/system_util.h" -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "absl/flags/flag.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/numbers.h" #include "data_manager/oss/oss_data_manager.h" #include "engine/engine.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" #include "session/session_handler_tool.h" ABSL_FLAG(std::string, input, "", "Input file"); diff --git a/src/session/session_handler_scenario_test.cc b/src/session/session_handler_scenario_test.cc index a9ffa1667..5201ea8b2 100644 --- a/src/session/session_handler_scenario_test.cc +++ b/src/session/session_handler_scenario_test.cc @@ -33,7 +33,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" @@ -42,6 +41,7 @@ #include "base/file_util.h" #include "engine/engine_interface.h" #include "engine/mock_data_engine_factory.h" +#include "protocol/commands.pb.h" #include "session/request_test_util.h" #include "session/session_handler_test_util.h" #include "session/session_handler_tool.h" diff --git a/src/session/session_handler_stress_test.cc b/src/session/session_handler_stress_test.cc index e6f97ea14..724c055d5 100644 --- a/src/session/session_handler_stress_test.cc +++ b/src/session/session_handler_stress_test.cc @@ -36,9 +36,9 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/flags/flag.h" #include "engine/engine_factory.h" +#include "protocol/commands.pb.h" #include "session/random_keyevents_generator.h" #include "session/request_test_util.h" #include "session/session_handler_tool.h" diff --git a/src/session/session_handler_test.cc b/src/session/session_handler_test.cc index f5582d6d9..11f7776fd 100644 --- a/src/session/session_handler_test.cc +++ b/src/session/session_handler_test.cc @@ -39,8 +39,6 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/flags/declare.h" #include "absl/flags/flag.h" @@ -59,6 +57,8 @@ #include "engine/engine_stub.h" #include "engine/mock_data_engine_factory.h" #include "engine/user_data_manager_mock.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/keymap.h" #include "session/session_handler_interface.h" #include "session/session_handler_test_util.h" diff --git a/src/session/session_handler_test_util.cc b/src/session/session_handler_test_util.cc index e6806854b..f3b025807 100644 --- a/src/session/session_handler_test_util.cc +++ b/src/session/session_handler_test_util.cc @@ -31,8 +31,6 @@ #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/flags/declare.h" #include "absl/flags/flag.h" #include "base/config_file_stream.h" @@ -40,6 +38,8 @@ #include "config/character_form_manager.h" #include "config/config_handler.h" #include "prediction/user_history_predictor.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/session_handler_interface.h" #include "storage/registry.h" diff --git a/src/session/session_handler_tool.cc b/src/session/session_handler_tool.cc index 5e502aa4f..ed9668d44 100644 --- a/src/session/session_handler_tool.cc +++ b/src/session/session_handler_tool.cc @@ -36,9 +36,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/log/check.h" #include "absl/log/log.h" #include "absl/status/status.h" @@ -62,6 +59,9 @@ #include "engine/engine_interface.h" #include "engine/user_data_manager_interface.h" #include "prediction/user_history_predictor.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/request_test_util.h" #include "session/session_handler.h" #include "session/session_handler_interface.h" diff --git a/src/session/session_handler_tool.h b/src/session/session_handler_tool.h index 13348c04f..6abe760da 100644 --- a/src/session/session_handler_tool.h +++ b/src/session/session_handler_tool.h @@ -35,14 +35,14 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/status/status.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" #include "engine/engine_interface.h" #include "engine/user_data_manager_interface.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/session_handler_interface.h" #include "session/session_observer_interface.h" diff --git a/src/session/session_interface.h b/src/session/session_interface.h index 2032ac0b1..b0bb2bffc 100644 --- a/src/session/session_interface.h +++ b/src/session/session_interface.h @@ -32,11 +32,11 @@ #ifndef MOZC_SESSION_SESSION_INTERFACE_H_ #define MOZC_SESSION_SESSION_INTERFACE_H_ -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "spelling/spellchecker_service_interface.h" #include "absl/time/time.h" #include "composer/table.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/keymap.h" namespace mozc { diff --git a/src/session/session_regression_test.cc b/src/session/session_regression_test.cc index 01c764713..2206d7f51 100644 --- a/src/session/session_regression_test.cc +++ b/src/session/session_regression_test.cc @@ -35,9 +35,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/flags/declare.h" #include "absl/flags/flag.h" #include "base/logging.h" @@ -48,6 +45,9 @@ #include "engine/engine.h" #include "engine/mock_data_engine_factory.h" #include "engine/user_data_manager_interface.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "session/internal/ime_context.h" #include "session/request_test_util.h" #include "session/session.h" diff --git a/src/session/session_server.cc b/src/session/session_server.cc index e48b4f3a5..9bf76ba8d 100644 --- a/src/session/session_server.cc +++ b/src/session/session_server.cc @@ -36,7 +36,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "absl/time/time.h" #include "base/logging.h" @@ -44,6 +43,7 @@ #include "engine/engine_factory.h" #include "ipc/ipc.h" #include "ipc/named_event.h" +#include "protocol/commands.pb.h" #include "session/session_handler.h" #include "session/session_usage_observer.h" diff --git a/src/session/session_test.cc b/src/session/session_test.cc index 02c326454..0b6e47b3d 100644 --- a/src/session/session_test.cc +++ b/src/session/session_test.cc @@ -36,9 +36,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -59,6 +56,9 @@ #include "engine/engine_mock.h" #include "engine/mock_data_engine_factory.h" #include "engine/user_data_manager_mock.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "request/conversion_request.h" #include "rewriter/transliteration_rewriter.h" #include "session/internal/ime_context.h" diff --git a/src/session/session_test.gyp b/src/session/session_test.gyp index 7f788b2b1..4010897d7 100644 --- a/src/session/session_test.gyp +++ b/src/session/session_test.gyp @@ -44,8 +44,8 @@ '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/engine/engine.gyp:engine_factory', '<(mozc_oss_src_dir)/engine/engine.gyp:mock_data_engine_factory', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', '<(mozc_oss_src_dir)/testing/testing.gyp:testing', '<(mozc_oss_src_dir)/usage_stats/usage_stats_test.gyp:usage_stats_testing_util', @@ -142,7 +142,7 @@ '<(mozc_oss_src_dir)/base/base_test.gyp:clock_mock', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/config/config.gyp:stats_config_util', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', '<(mozc_oss_src_dir)/usage_stats/usage_stats_base.gyp:usage_stats', @@ -182,7 +182,7 @@ 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', 'session_base.gyp:key_info_util', ], @@ -202,8 +202,8 @@ ], 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', '<(mozc_oss_src_dir)/testing/testing.gyp:testing_util', @@ -240,7 +240,7 @@ 'random_keyevents_generator_test.cc', ], 'dependencies': [ - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', 'session.gyp:random_keyevents_generator', ], @@ -292,8 +292,8 @@ '<(mozc_oss_src_dir)/data/test/session/scenario/scenario.gyp:install_session_handler_scenario_test_data', '<(mozc_oss_src_dir)/data/test/session/scenario/usage_stats/usage_stats.gyp:install_session_handler_usage_stats_scenario_test_data', '<(mozc_oss_src_dir)/engine/engine.gyp:mock_data_engine_factory', - '<(mozc_src_dir)/protocol/protocol.gyp:candidates_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:candidates_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', '<(mozc_oss_src_dir)/testing/testing.gyp:mozctest', '<(mozc_oss_src_dir)/usage_stats/usage_stats_test.gyp:usage_stats_testing_util', diff --git a/src/session/session_usage_observer.cc b/src/session/session_usage_observer.cc index 5a72fbe5e..a50d843e0 100644 --- a/src/session/session_usage_observer.cc +++ b/src/session/session_usage_observer.cc @@ -37,9 +37,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/state.pb.h" #include "absl/base/attributes.h" #include "absl/base/const_init.h" #include "absl/synchronization/mutex.h" @@ -48,6 +45,9 @@ #include "base/logging.h" #include "base/vlog.h" #include "config/stats_config_util.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/state.pb.h" #include "usage_stats/usage_stats.h" #include "usage_stats/usage_stats.pb.h" diff --git a/src/session/session_usage_observer_test.cc b/src/session/session_usage_observer_test.cc index d76397a37..2ef07b4be 100644 --- a/src/session/session_usage_observer_test.cc +++ b/src/session/session_usage_observer_test.cc @@ -32,13 +32,13 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/time/time.h" #include "base/clock.h" #include "base/clock_mock.h" #include "base/logging.h" #include "config/stats_config_util.h" #include "config/stats_config_util_mock.h" +#include "protocol/commands.pb.h" #include "testing/gunit.h" #include "testing/mozctest.h" #include "usage_stats/usage_stats.h" diff --git a/src/session/session_usage_stats_util.cc b/src/session/session_usage_stats_util.cc index f5b44ec6d..2d05cf695 100644 --- a/src/session/session_usage_stats_util.cc +++ b/src/session/session_usage_stats_util.cc @@ -32,13 +32,13 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/algorithm/container.h" #include "absl/strings/str_join.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "base/util.h" +#include "protocol/commands.pb.h" #include "usage_stats/usage_stats.h" namespace mozc { diff --git a/src/session/session_usage_stats_util.h b/src/session/session_usage_stats_util.h index 02555963c..9e93620d1 100644 --- a/src/session/session_usage_stats_util.h +++ b/src/session/session_usage_stats_util.h @@ -30,8 +30,8 @@ #ifndef MOZC_SESSION_SESSION_USAGE_STATS_UTIL_H_ #define MOZC_SESSION_SESSION_USAGE_STATS_UTIL_H_ -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" +#include "protocol/commands.pb.h" namespace mozc { namespace session { diff --git a/src/session/session_usage_stats_util_test.cc b/src/session/session_usage_stats_util_test.cc index 8803ce381..0ed024d90 100644 --- a/src/session/session_usage_stats_util_test.cc +++ b/src/session/session_usage_stats_util_test.cc @@ -29,9 +29,9 @@ #include "session/session_usage_stats_util.h" -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "composer/key_parser.h" +#include "protocol/commands.pb.h" #include "testing/gunit.h" #include "usage_stats/usage_stats.h" #include "usage_stats/usage_stats_testing_util.h" diff --git a/src/spelling/spellchecker_service_interface.h b/src/spelling/spellchecker_service_interface.h index f44a638f6..511ec36df 100644 --- a/src/spelling/spellchecker_service_interface.h +++ b/src/spelling/spellchecker_service_interface.h @@ -36,9 +36,9 @@ #include #include +#include "converter/segments.h" #include "protocol/commands.pb.h" #include "protocol/engine_builder.pb.h" -#include "converter/segments.h" namespace mozc { namespace spelling { diff --git a/src/unix/emacs/emacs.gyp b/src/unix/emacs/emacs.gyp index a9e0b2ab4..e1e62f907 100644 --- a/src/unix/emacs/emacs.gyp +++ b/src/unix/emacs/emacs.gyp @@ -44,8 +44,8 @@ '<(mozc_oss_src_dir)/base/base.gyp:version', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/ipc/ipc.gyp:ipc', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', 'mozc_emacs_helper_lib', ], }, @@ -62,8 +62,8 @@ '<(mozc_oss_src_dir)/base/base.gyp:number_util', '<(mozc_oss_src_dir)/client/client.gyp:client', '<(mozc_oss_src_dir)/composer/composer.gyp:key_parser', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/storage/storage.gyp:storage', ], }, diff --git a/src/unix/emacs/mozc_emacs_helper.cc b/src/unix/emacs/mozc_emacs_helper.cc index 47d9e9eea..120c9c441 100644 --- a/src/unix/emacs/mozc_emacs_helper.cc +++ b/src/unix/emacs/mozc_emacs_helper.cc @@ -34,7 +34,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/flags/flag.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" @@ -44,6 +43,7 @@ #include "base/version.h" #include "client/client.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" #include "unix/emacs/client_pool.h" #include "unix/emacs/mozc_emacs_helper_lib.h" diff --git a/src/unix/emacs/mozc_emacs_helper_lib.cc b/src/unix/emacs/mozc_emacs_helper_lib.cc index 7ac959d79..1582a1a1a 100644 --- a/src/unix/emacs/mozc_emacs_helper_lib.cc +++ b/src/unix/emacs/mozc_emacs_helper_lib.cc @@ -36,8 +36,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "absl/base/optimization.h" #include "absl/strings/ascii.h" #include "absl/strings/numbers.h" @@ -49,6 +47,8 @@ #include "base/protobuf/descriptor.h" #include "base/util.h" #include "composer/key_parser.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" namespace mozc { namespace emacs { diff --git a/src/unix/emacs/mozc_emacs_helper_lib.h b/src/unix/emacs/mozc_emacs_helper_lib.h index 009fcda05..dd12d0dd7 100644 --- a/src/unix/emacs/mozc_emacs_helper_lib.h +++ b/src/unix/emacs/mozc_emacs_helper_lib.h @@ -34,10 +34,10 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "base/protobuf/message.h" #include "base/protobuf/protobuf.h" +#include "protocol/commands.pb.h" namespace mozc { namespace emacs { diff --git a/src/unix/emacs/mozc_emacs_helper_lib_test.cc b/src/unix/emacs/mozc_emacs_helper_lib_test.cc index 9e17c1c92..7a0317972 100644 --- a/src/unix/emacs/mozc_emacs_helper_lib_test.cc +++ b/src/unix/emacs/mozc_emacs_helper_lib_test.cc @@ -33,12 +33,12 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h" #include "base/protobuf/message.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "testing/testing_util.h" diff --git a/src/unix/ibus/candidate_window_handler.cc b/src/unix/ibus/candidate_window_handler.cc index 7589ed034..c75729bae 100644 --- a/src/unix/ibus/candidate_window_handler.cc +++ b/src/unix/ibus/candidate_window_handler.cc @@ -36,11 +36,11 @@ #include #include +#include "absl/strings/string_view.h" +#include "base/logging.h" #include "protocol/candidates.pb.h" #include "protocol/commands.pb.h" #include "protocol/renderer_command.pb.h" -#include "absl/strings/string_view.h" -#include "base/logging.h" #include "renderer/renderer_interface.h" #include "unix/ibus/ibus_wrapper.h" diff --git a/src/unix/ibus/candidate_window_handler.h b/src/unix/ibus/candidate_window_handler.h index c04331974..d118dc58a 100644 --- a/src/unix/ibus/candidate_window_handler.h +++ b/src/unix/ibus/candidate_window_handler.h @@ -34,9 +34,9 @@ #include #include +#include "base/port.h" #include "protocol/commands.pb.h" #include "protocol/renderer_command.pb.h" -#include "base/port.h" #include "renderer/renderer_interface.h" #include "unix/ibus/candidate_window_handler_interface.h" #include "unix/ibus/ibus_wrapper.h" diff --git a/src/unix/ibus/candidate_window_handler_test.cc b/src/unix/ibus/candidate_window_handler_test.cc index 949126170..faac8a2f5 100644 --- a/src/unix/ibus/candidate_window_handler_test.cc +++ b/src/unix/ibus/candidate_window_handler_test.cc @@ -31,10 +31,10 @@ #include // for getpid() +#include "base/coordinates.h" #include "protocol/candidates.pb.h" #include "protocol/commands.pb.h" #include "protocol/renderer_command.pb.h" -#include "base/coordinates.h" #include "renderer/renderer_mock.h" #include "testing/gmock.h" #include "testing/gunit.h" diff --git a/src/unix/ibus/ibus_candidate_window_handler.cc b/src/unix/ibus/ibus_candidate_window_handler.cc index d03a58a0a..cab600f3a 100644 --- a/src/unix/ibus/ibus_candidate_window_handler.cc +++ b/src/unix/ibus/ibus_candidate_window_handler.cc @@ -33,11 +33,11 @@ #include #include +#include "absl/strings/str_format.h" +#include "base/logging.h" #include "protocol/candidates.pb.h" #include "protocol/commands.pb.h" #include "protocol/config.pb.h" -#include "absl/strings/str_format.h" -#include "base/logging.h" #include "unix/ibus/ibus_wrapper.h" namespace mozc { diff --git a/src/unix/ibus/key_event_handler.h b/src/unix/ibus/key_event_handler.h index 1dd0cccc2..aaed10d03 100644 --- a/src/unix/ibus/key_event_handler.h +++ b/src/unix/ibus/key_event_handler.h @@ -33,9 +33,9 @@ #include #include +#include "base/port.h" #include "protocol/commands.pb.h" #include "protocol/config.pb.h" -#include "base/port.h" #include "unix/ibus/key_translator.h" namespace mozc { diff --git a/src/unix/ibus/key_event_handler_test.cc b/src/unix/ibus/key_event_handler_test.cc index 54b884de0..8db8d6ea4 100644 --- a/src/unix/ibus/key_event_handler_test.cc +++ b/src/unix/ibus/key_event_handler_test.cc @@ -32,13 +32,13 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/random/random.h" #include "absl/strings/str_format.h" #include "base/clock.h" #include "base/port.h" #include "base/util.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/unix/ibus/key_translator.h b/src/unix/ibus/key_translator.h index 2db074553..d09fa35e6 100644 --- a/src/unix/ibus/key_translator.h +++ b/src/unix/ibus/key_translator.h @@ -32,9 +32,9 @@ #include +#include "base/port.h" #include "protocol/commands.pb.h" #include "protocol/config.pb.h" -#include "base/port.h" #include "unix/ibus/ibus_header.h" namespace mozc { diff --git a/src/unix/ibus/key_translator_test.cc b/src/unix/ibus/key_translator_test.cc index 61ac39966..8746cda4d 100644 --- a/src/unix/ibus/key_translator_test.cc +++ b/src/unix/ibus/key_translator_test.cc @@ -32,8 +32,8 @@ #include #include -#include "protocol/commands.pb.h" #include "base/protobuf/protobuf.h" +#include "protocol/commands.pb.h" #include "testing/gunit.h" namespace mozc { diff --git a/src/unix/ibus/mozc_engine.cc b/src/unix/ibus/mozc_engine.cc index a82d99886..591188a87 100644 --- a/src/unix/ibus/mozc_engine.cc +++ b/src/unix/ibus/mozc_engine.cc @@ -38,9 +38,6 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/flags/flag.h" #include "absl/strings/str_split.h" #include "absl/strings/string_view.h" @@ -53,6 +50,9 @@ #include "base/system_util.h" #include "base/util.h" #include "client/client.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "renderer/renderer_client.h" #include "unix/ibus/candidate_window_handler.h" #include "unix/ibus/engine_registrar.h" diff --git a/src/unix/ibus/mozc_engine.h b/src/unix/ibus/mozc_engine.h index 24439b5be..5e1a963b4 100644 --- a/src/unix/ibus/mozc_engine.h +++ b/src/unix/ibus/mozc_engine.h @@ -35,10 +35,10 @@ #include #include -#include "protocol/commands.pb.h" -#include "protocol/config.pb.h" #include "absl/container/flat_hash_map.h" #include "base/port.h" +#include "protocol/commands.pb.h" +#include "protocol/config.pb.h" #include "testing/gunit_prod.h" #include "unix/ibus/candidate_window_handler.h" #include "unix/ibus/engine_interface.h" diff --git a/src/unix/ibus/mozc_engine_test.cc b/src/unix/ibus/mozc_engine_test.cc index 2139086ba..a02c3ae91 100644 --- a/src/unix/ibus/mozc_engine_test.cc +++ b/src/unix/ibus/mozc_engine_test.cc @@ -33,10 +33,10 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/container/flat_hash_map.h" #include "base/port.h" #include "client/client_mock.h" +#include "protocol/commands.pb.h" #include "testing/gmock.h" #include "testing/gunit.h" #include "unix/ibus/ibus_config.h" diff --git a/src/unix/ibus/preedit_handler.cc b/src/unix/ibus/preedit_handler.cc index 64b843fab..73eed11c9 100644 --- a/src/unix/ibus/preedit_handler.cc +++ b/src/unix/ibus/preedit_handler.cc @@ -31,8 +31,8 @@ #include -#include "protocol/commands.pb.h" #include "base/logging.h" +#include "protocol/commands.pb.h" #include "unix/ibus/ibus_wrapper.h" namespace mozc { diff --git a/src/unix/ibus/property_handler.cc b/src/unix/ibus/property_handler.cc index d6f01482b..212c9d77b 100644 --- a/src/unix/ibus/property_handler.cc +++ b/src/unix/ibus/property_handler.cc @@ -31,12 +31,12 @@ #include -#include "protocol/commands.pb.h" #include "base/const.h" #include "base/file_util.h" #include "base/logging.h" #include "base/system_util.h" #include "client/client.h" // For client interface +#include "protocol/commands.pb.h" #include "unix/ibus/ibus_header.h" #include "unix/ibus/ibus_wrapper.h" #include "unix/ibus/message_translator.h" diff --git a/src/unix/ibus/property_handler.h b/src/unix/ibus/property_handler.h index 124bac021..1d1cf8e60 100644 --- a/src/unix/ibus/property_handler.h +++ b/src/unix/ibus/property_handler.h @@ -33,8 +33,8 @@ #include #include -#include "protocol/commands.pb.h" #include "client/client.h" +#include "protocol/commands.pb.h" #include "unix/ibus/ibus_header.h" #include "unix/ibus/ibus_wrapper.h" #include "unix/ibus/message_translator.h" diff --git a/src/win32/base/config_snapshot.cc b/src/win32/base/config_snapshot.cc index 801866568..1676a5398 100644 --- a/src/win32/base/config_snapshot.cc +++ b/src/win32/base/config_snapshot.cc @@ -31,10 +31,10 @@ #include -#include "protocol/config.pb.h" #include "base/win32/win_util.h" #include "client/client_interface.h" #include "config/config_handler.h" +#include "protocol/config.pb.h" namespace mozc { namespace win32 { diff --git a/src/win32/base/deleter.cc b/src/win32/base/deleter.cc index 78fc6a992..02a47dfbd 100644 --- a/src/win32/base/deleter.cc +++ b/src/win32/base/deleter.cc @@ -33,8 +33,8 @@ #include #include -#include "protocol/commands.pb.h" #include "base/logging.h" +#include "protocol/commands.pb.h" #include "win32/base/input_state.h" #include "win32/base/keyboard.h" diff --git a/src/win32/base/keyevent_handler.cc b/src/win32/base/keyevent_handler.cc index e9d73f29c..93c1be01f 100644 --- a/src/win32/base/keyevent_handler.cc +++ b/src/win32/base/keyevent_handler.cc @@ -35,12 +35,12 @@ #include -#include "protocol/commands.pb.h" #include "base/japanese_util.h" #include "base/logging.h" #include "base/util.h" #include "client/client_interface.h" #include "config/config_handler.h" +#include "protocol/commands.pb.h" #include "session/key_info_util.h" #include "win32/base/conversion_mode_util.h" #include "win32/base/input_state.h" diff --git a/src/win32/base/keyevent_handler_test.cc b/src/win32/base/keyevent_handler_test.cc index e58b2b0e8..c29797a84 100644 --- a/src/win32/base/keyevent_handler_test.cc +++ b/src/win32/base/keyevent_handler_test.cc @@ -42,7 +42,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/string_view.h" #include "base/logging.h" #include "base/version.h" @@ -51,6 +50,7 @@ #include "composer/key_event_util.h" #include "config/config_handler.h" #include "ipc/ipc_mock.h" +#include "protocol/commands.pb.h" #include "session/key_info_util.h" #include "testing/gunit.h" #include "testing/mozctest.h" diff --git a/src/win32/base/string_util.cc b/src/win32/base/string_util.cc index e6b23ba8c..3c8a7f106 100644 --- a/src/win32/base/string_util.cc +++ b/src/win32/base/string_util.cc @@ -32,11 +32,11 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/strings/str_replace.h" #include "absl/strings/string_view.h" #include "base/japanese_util.h" #include "base/util.h" +#include "protocol/commands.pb.h" namespace mozc { namespace win32 { diff --git a/src/win32/base/win32_base.gyp b/src/win32/base/win32_base.gyp index 941ab7731..2a0f98744 100644 --- a/src/win32/base/win32_base.gyp +++ b/src/win32/base/win32_base.gyp @@ -124,7 +124,7 @@ ], 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', 'imframework_util', ], @@ -150,8 +150,8 @@ '<(mozc_oss_src_dir)/base/absl.gyp:absl_strings', '<(mozc_oss_src_dir)/base/base.gyp:base', '<(mozc_oss_src_dir)/config/config.gyp:config_handler', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/session/session_base.gyp:key_info_util', ], }, @@ -197,7 +197,7 @@ ], 'dependencies': [ '<(mozc_oss_src_dir)/base/base.gyp:base', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', '<(mozc_oss_src_dir)/testing/testing.gyp:gtest_main', 'ime_base', ], diff --git a/src/win32/broker/broker.gyp b/src/win32/broker/broker.gyp index b31418864..e6e948bfb 100644 --- a/src/win32/broker/broker.gyp +++ b/src/win32/broker/broker.gyp @@ -83,7 +83,7 @@ '<(mozc_oss_src_dir)/base/base.gyp:crash_report_handler', '<(mozc_oss_src_dir)/client/client.gyp:client', '<(mozc_oss_src_dir)/config/config.gyp:stats_config_util', - '<(mozc_src_dir)/protocol/protocol.gyp:config_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:config_proto', '<(mozc_oss_src_dir)/renderer/renderer.gyp:renderer_client', '../base/win32_base.gyp:ime_base', 'gen_mozc_broker_resource_header', diff --git a/src/win32/tip/tip.gyp b/src/win32/tip/tip.gyp index 3b16eaec0..4825400dd 100644 --- a/src/win32/tip/tip.gyp +++ b/src/win32/tip/tip.gyp @@ -102,8 +102,8 @@ '<(mozc_oss_src_dir)/config/config.gyp:config_handler', '<(mozc_oss_src_dir)/config/config.gyp:stats_config_util', '<(mozc_oss_src_dir)/protobuf/protobuf.gyp:protobuf', - '<(mozc_src_dir)/protocol/protocol.gyp:commands_proto', - '<(mozc_src_dir)/protocol/protocol.gyp:renderer_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:commands_proto', + '<(mozc_oss_src_dir)/protocol/protocol.gyp:renderer_proto', '<(mozc_oss_src_dir)/renderer/renderer.gyp:win32_renderer_client', '../base/win32_base.gyp:ime_base', '../base/win32_base.gyp:ime_impl_base', diff --git a/src/win32/tip/tip_edit_session.cc b/src/win32/tip/tip_edit_session.cc index b4a517855..3e79aae4e 100644 --- a/src/win32/tip/tip_edit_session.cc +++ b/src/win32/tip/tip_edit_session.cc @@ -39,12 +39,12 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "base/logging.h" #include "base/win32/com.h" #include "base/win32/wide_char.h" #include "client/client_interface.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" #include "win32/base/conversion_mode_util.h" #include "win32/base/deleter.h" #include "win32/base/input_state.h" diff --git a/src/win32/tip/tip_edit_session_impl.cc b/src/win32/tip/tip_edit_session_impl.cc index e46ceb910..4c638cdbb 100644 --- a/src/win32/tip/tip_edit_session_impl.cc +++ b/src/win32/tip/tip_edit_session_impl.cc @@ -40,13 +40,13 @@ #include #include -#include "protocol/commands.pb.h" #include "base/logging.h" #include "base/util.h" #include "base/win32/com.h" #include "base/win32/hresultor.h" #include "base/win32/wide_char.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" #include "win32/base/conversion_mode_util.h" #include "win32/base/input_state.h" #include "win32/base/string_util.h" diff --git a/src/win32/tip/tip_keyevent_handler.cc b/src/win32/tip/tip_keyevent_handler.cc index a47e9ad8e..ce550207e 100644 --- a/src/win32/tip/tip_keyevent_handler.cc +++ b/src/win32/tip/tip_keyevent_handler.cc @@ -37,10 +37,10 @@ #include #include -#include "protocol/commands.pb.h" #include "base/logging.h" #include "base/win32/wide_char.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" #include "win32/base/conversion_mode_util.h" #include "win32/base/deleter.h" #include "win32/base/input_state.h" diff --git a/src/win32/tip/tip_lang_bar.cc b/src/win32/tip/tip_lang_bar.cc index 2562cb65d..0a747b17c 100644 --- a/src/win32/tip/tip_lang_bar.cc +++ b/src/win32/tip/tip_lang_bar.cc @@ -38,10 +38,10 @@ #include #include -#include "protocol/commands.pb.h" #include "base/logging.h" #include "base/win32/com.h" #include "base/win32/hresultor.h" +#include "protocol/commands.pb.h" #include "win32/tip/tip_dll_module.h" #include "win32/tip/tip_lang_bar_callback.h" #include "win32/tip/tip_lang_bar_menu.h" diff --git a/src/win32/tip/tip_private_context.cc b/src/win32/tip/tip_private_context.cc index e83e03dfa..5f33f2663 100644 --- a/src/win32/tip/tip_private_context.cc +++ b/src/win32/tip/tip_private_context.cc @@ -33,9 +33,9 @@ #include -#include "protocol/commands.pb.h" #include "client/client.h" #include "client/client_interface.h" +#include "protocol/commands.pb.h" #include "win32/base/config_snapshot.h" #include "win32/base/deleter.h" #include "win32/base/input_state.h" diff --git a/src/win32/tip/tip_query_provider.cc b/src/win32/tip/tip_query_provider.cc index 8af241575..9adbfec05 100644 --- a/src/win32/tip/tip_query_provider.cc +++ b/src/win32/tip/tip_query_provider.cc @@ -36,11 +36,11 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" #include "base/win32/wide_char.h" #include "client/client.h" #include "client/client_interface.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" namespace mozc { namespace win32 { diff --git a/src/win32/tip/tip_text_service.cc b/src/win32/tip/tip_text_service.cc index 48221cfb3..7b87ecd97 100644 --- a/src/win32/tip/tip_text_service.cc +++ b/src/win32/tip/tip_text_service.cc @@ -42,7 +42,6 @@ #include #include -#include "protocol/commands.pb.h" #include "absl/base/casts.h" #include "absl/container/flat_hash_map.h" #include "absl/functional/any_invocable.h" @@ -57,6 +56,7 @@ #include "base/win32/hresult.h" #include "base/win32/hresultor.h" #include "base/win32/win_util.h" +#include "protocol/commands.pb.h" #include "win32/base/win32_window_util.h" #include "win32/tip/tip_display_attributes.h" #include "win32/tip/tip_dll_module.h" diff --git a/src/win32/tip/tip_ui_element_delegate.cc b/src/win32/tip/tip_ui_element_delegate.cc index 124d94be5..81e84a7a4 100644 --- a/src/win32/tip/tip_ui_element_delegate.cc +++ b/src/win32/tip/tip_ui_element_delegate.cc @@ -39,12 +39,12 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/renderer_command.pb.h" #include "base/logging.h" #include "base/win32/com.h" #include "base/win32/wide_char.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_command.pb.h" #include "win32/tip/tip_dll_module.h" #include "win32/tip/tip_edit_session.h" #include "win32/tip/tip_private_context.h" diff --git a/src/win32/tip/tip_ui_element_manager.cc b/src/win32/tip/tip_ui_element_manager.cc index 870467d73..7c50b1742 100644 --- a/src/win32/tip/tip_ui_element_manager.cc +++ b/src/win32/tip/tip_ui_element_manager.cc @@ -36,11 +36,11 @@ #include #include +#include "absl/container/flat_hash_map.h" +#include "base/win32/com.h" #include "protocol/candidates.pb.h" #include "protocol/commands.pb.h" #include "protocol/renderer_command.pb.h" -#include "absl/container/flat_hash_map.h" -#include "base/win32/com.h" #include "win32/base/input_state.h" #include "win32/tip/tip_input_mode_manager.h" #include "win32/tip/tip_private_context.h" diff --git a/src/win32/tip/tip_ui_handler_conventional.cc b/src/win32/tip/tip_ui_handler_conventional.cc index bd4ceeb1a..418a7f04b 100644 --- a/src/win32/tip/tip_ui_handler_conventional.cc +++ b/src/win32/tip/tip_ui_handler_conventional.cc @@ -36,13 +36,13 @@ #include #include -#include "protocol/candidates.pb.h" -#include "protocol/commands.pb.h" -#include "protocol/renderer_command.pb.h" #include "base/logging.h" #include "base/util.h" #include "base/win32/com.h" #include "base/win32/win_util.h" +#include "protocol/candidates.pb.h" +#include "protocol/commands.pb.h" +#include "protocol/renderer_command.pb.h" #include "renderer/win32/win32_renderer_client.h" #include "win32/base/input_state.h" #include "win32/tip/tip_composition_util.h"