Commit 9070e4fabd596b50d00e36f58ac4c2162f27b825 - mozc

+1

-1

src/android/genproto_java.gyp less more

139	139	'type': 'none',
140	140	'variables': {
141	141	'proto_files': [
142		'../config/config.proto',
	142	'../protocol/config.proto',
143	143	],
144	144	},
145	145	'actions': [

+1

-1

src/chrome/nacl/nacl_extension.gyp less more

171	171	'../../base/base.gyp:base',
172	172	'../../composer/composer.gyp:key_parser',
173	173	'../../config/config.gyp:config_handler',
174		'../../config/config.gyp:config_protocol',
175	174	'../../dictionary/dictionary_base.gyp:user_dictionary',
176	175	'../../dictionary/dictionary_base.gyp:user_pos',
177	176	'../../net/net.gyp:http_client',
178	177	'../../net/net.gyp:json_util',
179	178	'../../protocol/protocol.gyp:commands_proto',
	179	'../../protocol/protocol.gyp:config_proto',
180	180	'../../session/session.gyp:session',
181	181	'../../session/session.gyp:session_handler',
182	182	'../../session/session.gyp:session_usage_observer',

+2

-2

src/chrome/nacl/nacl_session_handler.cc less more

45	45	#include "base/version.h"
46	46	#include "chrome/nacl/dictionary_downloader.h"
47	47	#include "config/config_handler.h"
48		#include "config/config.pb.h"
49	48	#include "data_manager/packed/packed_data_manager.h"
50	49	#include "dictionary/user_dictionary_util.h"
51	50	#include "dictionary/user_pos.h"
52	51	#include "engine/engine_factory.h"
53	52	#include "net/http_client.h"
54	53	#include "net/http_client_pepper.h"
	54	#include "net/json_util.h"
55	55	#include "net/jsoncpp.h"
56		#include "net/json_util.h"
57	56	#include "protocol/commands.pb.h"
	57	#include "protocol/config.pb.h"
58	58	#include "session/session_handler.h"
59	59	#include "session/session_usage_observer.h"
60	60	#include "usage_stats/usage_stats.h"

+1

-1

src/client/client.cc less more

49	49	#include "base/system_util.h"
50	50	#include "base/util.h"
51	51	#include "base/version.h"
52		#include "config/config.pb.h"
53	52	#include "ipc/ipc.h"
54	53	#include "protocol/commands.pb.h"
	54	#include "protocol/config.pb.h"
55	55
56	56	#ifdef OS_MACOSX
57	57	#include "base/mac_process.h"

+2

-2

src/client/client.gyp less more

41	41	],
42	42	'dependencies': [
43	43	'../base/base.gyp:base',
44		'../config/config.gyp:config_protocol',
45	44	'../ipc/ipc.gyp:ipc',
46	45	'../protocol/protocol.gyp:commands_proto',
	46	'../protocol/protocol.gyp:config_proto',
47	47	],
48	48	},
49	49	{

54	54	],
55	55	'dependencies': [
56	56	'../base/base.gyp:base',
57		'../config/config.gyp:config_protocol',
58	57	'../protocol/protocol.gyp:commands_proto',
	58	'../protocol/protocol.gyp:config_proto',
59	59	],
60	60	},
61	61	],

+1

-1

src/composer/composer.cc less more

42	42	#include "composer/table.h"
43	43	#include "composer/type_corrected_query.h"
44	44	#include "config/character_form_manager.h"
45		#include "config/config.pb.h"
46	45	#include "config/config_handler.h"
47	46	#include "protocol/commands.pb.h"
	47	#include "protocol/config.pb.h"
48	48
49	49	// Use flags instead of constant for performance evaluation.
50	50	DEFINE_uint64(max_typing_correction_query_candidates, 40,

+2

-2

src/composer/composer.gyp less more

56	56	'../composer/composer.gyp:key_parser',
57	57	'../config/config.gyp:character_form_manager',
58	58	'../config/config.gyp:config_handler',
59		'../config/config.gyp:config_protocol',
	59	'../protocol/protocol.gyp:config_proto',
60	60	'../protobuf/protobuf.gyp:protobuf',
61	61	'../protocol/protocol.gyp:commands_proto',
62	62	'../transliteration/transliteration.gyp:transliteration',

225	225	],
226	226	'dependencies': [
227	227	'../base/base.gyp:base',
228		'../config/config.gyp:config_protocol',
	228	'../protocol/protocol.gyp:config_proto',
229	229	'../protocol/protocol.gyp:commands_proto',
230	230	],
231	231	},

+1

-1

src/composer/composer_test.cc less more

40	40	#include "composer/key_parser.h"
41	41	#include "composer/table.h"
42	42	#include "config/character_form_manager.h"
43		#include "config/config.pb.h"
44	43	#include "config/config_handler.h"
45	44	#include "protocol/commands.pb.h"
	45	#include "protocol/config.pb.h"
46	46	#include "testing/base/public/gunit.h"
47	47
48	48	DECLARE_string(test_tmpdir);

+1

-1

src/composer/composer_test.gyp less more

44	44	],
45	45	'dependencies': [
46	46	'../config/config.gyp:config_handler',
47		'../config/config.gyp:config_protocol',
48	47	'../protocol/protocol.gyp:commands_proto',
	48	'../protocol/protocol.gyp:config_proto',
49	49	'../session/session_base.gyp:request_test_util',
50	50	'../testing/testing.gyp:gtest_main',
51	51	'composer.gyp:composer',

+1

-1

src/composer/internal/typing_corrector.cc less more

40	40	#include "composer/internal/typing_model.h"
41	41	#include "composer/table.h"
42	42	#include "composer/type_corrected_query.h"
43		#include "config/config.pb.h"
44	43	#include "config/config_handler.h"
	44	#include "protocol/config.pb.h"
45	45
46	46	DEFINE_bool(enable_typing_correction, false,
47	47	"Force enabling typing correction feature "

+1

-1

src/composer/table.cc less more

43	43	#include "base/trie.h"
44	44	#include "base/util.h"
45	45	#include "composer/internal/typing_model.h"
46		#include "config/config.pb.h"
47	46	#include "config/config_handler.h"
48	47	#include "protocol/commands.pb.h"
	48	#include "protocol/config.pb.h"
49	49
50	50	namespace mozc {
51	51	namespace composer {

+1

-1

src/composer/table_test.cc less more

32	32	#include "base/port.h"
33	33	#include "base/system_util.h"
34	34	#include "composer/internal/composition_input.h"
35		#include "config/config.pb.h"
36	35	#include "config/config_handler.h"
37	36	#include "protocol/commands.pb.h"
	37	#include "protocol/config.pb.h"
38	38	#include "testing/base/public/gunit.h"
39	39
40	40	DECLARE_string(test_tmpdir);

+1

-1

src/config/character_form_manager.cc less more

40	40	#include "base/scoped_ptr.h"
41	41	#include "base/singleton.h"
42	42	#include "base/util.h"
43		#include "config/config.pb.h"
44	43	#include "config/config_handler.h"
	44	#include "protocol/config.pb.h"
45	45	#include "storage/lru_storage.h"
46	46
47	47	namespace mozc {

+1

-1

src/config/character_form_manager.h less more

34	34	#include <utility>
35	35	#include "base/port.h"
36	36	#include "base/scoped_ptr.h"
37		#include "config/config.pb.h"
	37	#include "protocol/config.pb.h"
38	38
39	39	namespace mozc {
40	40

+2

-2

src/config/character_form_manager_test.cc less more

31	31	#include <string>
32	32
33	33	#include "base/system_util.h"
34		#include "config/config.pb.h"
35	34	#include "config/config_handler.h"
	35	#include "protocol/config.pb.h"
	36	#include "testing/base/public/googletest.h"
36	37	#include "testing/base/public/gunit.h"
37		#include "testing/base/public/googletest.h"
38	38
39	39	DECLARE_string(test_tmpdir);
40	40

+3

-29

src/config/config.gyp less more

41	41	'dependencies': [
42	42	'../base/base.gyp:base',
43	43	'../base/base.gyp:config_file_stream',
44		'config_protocol',
45		],
46		},
47		{
48		'target_name': 'genproto_config',
49		'type': 'none',
50		'toolsets': ['host'],
51		'sources': [
52		'config.proto',
53		],
54		'includes': [
55		'../protobuf/genproto.gypi',
56		],
57		},
58		{
59		'target_name': 'config_protocol',
60		'type': 'static_library',
61		'hard_dependency': 1,
62		'sources': [
63		'<(proto_out_dir)/<(relative_dir)/config.pb.cc',
64		],
65		'dependencies': [
66		'../protobuf/protobuf.gyp:protobuf',
67		'genproto_config#host',
68		],
69		'export_dependent_settings': [
70		'genproto_config#host',
	44	'../protocol/protocol.gyp:config_proto',
71	45	],
72	46	},
73	47	{

84	58	'(target_platform=="NaCl" and _toolset=="target")', {
85	59	'dependencies': [
86	60	'config_handler',
87		'config_protocol',
	61	'../protocol/protocol.gyp:config_proto',
88	62	],
89	63	}],
90	64	],

97	71	],
98	72	'dependencies': [
99	73	'config_handler',
100		'config_protocol',
101	74	'../base/base.gyp:base',
102	75	'../base/base.gyp:config_file_stream',
	76	'../protocol/protocol.gyp:config_proto',
103	77	# storage.gyp:storage is depended by character_form_manager.
104	78	# TODO(komatsu): delete this line.
105	79	'../storage/storage.gyp:storage',

+0

-333

~~src/config/config.proto~~ less more

0		// Copyright 2010-2015, Google Inc.
1		// All rights reserved.
2		//
3		// Redistribution and use in source and binary forms, with or without
4		// modification, are permitted provided that the following conditions are
5		// met:
6		//
7		// * Redistributions of source code must retain the above copyright
8		// notice, this list of conditions and the following disclaimer.
9		// * Redistributions in binary form must reproduce the above
10		// copyright notice, this list of conditions and the following disclaimer
11		// in the documentation and/or other materials provided with the
12		// distribution.
13		// * Neither the name of Google Inc. nor the names of its
14		// contributors may be used to endorse or promote products derived from
15		// this software without specific prior written permission.
16		//
17		// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
18		// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
19		// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
20		// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
21		// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
22		// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
23		// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24		// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25		// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26		// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27		// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28
29		// Protocol messages to be used for mozc configuration.
30		syntax = "proto2";
31
32		package mozc.config;
33
34		option java_outer_classname = "ProtoConfig";
35		option java_package = "org.mozc.android.inputmethod.japanese.protobuf";
36
37		message GeneralConfig {
38		//////////////////////////////////////////////////////////////
39		//
40		// General config (1-9)
41		//
42
43		// config version, corresponding to the suffix of config file
44		optional uint32 config_version = 1 [ default = 0 ];
45
46		// The product version that wrote this config
47		optional string last_modified_product_version = 2 [ default = "0.0.0.0" ];
48
49		// last modified time in UTC second
50		optional uint64 last_modified_time = 3 [ default = 0 ];
51
52		// These fileds are not used now
53		// platform of machine that wrote this config
54		optional string platform = 4 [ default = "" ];
55
56		// UI locale of machine that wrote this config
57		optional string ui_locale = 5 [ default = "" ];
58
59		// Whether to upload usage stats
60		// This flag is used only for Android.
61		optional bool upload_usage_stats = 6 [default = false];
62		};
63
64		message OBSOLETE_SyncConfig {
65		optional bool use_config_sync = 1 [ default = false ];
66		optional bool use_user_dictionary_sync = 2 [ default = false ];
67		optional bool use_user_history_sync = 3 [ default = false ];
68		optional bool use_learning_preference_sync = 4 [ default = false ];
69		optional bool use_contact_list_sync = 5 [ default = false ];
70		};
71
72		message Config {
73		// General config and logging/debugging:
74		// We won't use 2-9 and 20-39 ids anymore for historical reasons.
75		optional GeneralConfig general_config = 1;
76
77		//////////////////////////////////////////////////////////////
78		//
79		// Logging/Debugging (10-19)
80		//
81
82		// set verbose level of logging library (FLAGS_v)
83		optional int32 verbose_level = 10 [ default = 0 ];
84
85		// This flag is not used
86		optional bool DEPRECATED_log_all_commands = 11 [ default = false ];
87
88		//////////////////////////////////////////////////////////////
89		//
90		// Misc fields (20-39)
91		//
92
93		// Incognito mode:
94		// Disable all mutable operation if incognito_mode is true
95		optional bool incognito_mode = 20 [default = false];
96
97		// whether to show the set default dialog on startup
98		optional bool check_default = 22 [ default = true ];
99
100		// Presentation mode:
101		// disable all suggestion temporally.
102		optional bool presentation_mode = 23 [ default = false ];
103
104		//////////////////////////////////////////////////////////////
105		//
106		// Basic features (40-79)
107		//
108		enum PreeditMethod {
109		ROMAN = 0;
110		KANA = 1;
111		};
112
113		// Roman/Kana
114		optional PreeditMethod preedit_method = 40 [default = ROMAN];
115
116		enum SessionKeymap {
117		// If NONE is selected, it will be replaced with MSIME or KOTOERI.
118		// NONE is used only for a placeholder, so a configuration program
119		// should not show NONE as one of selections. NONE should be the
120		// last of the items due to the limitation of the Qt GUI's
121		// implementation. Note that keymap number should be correspoinding
122		// to the index of QComboBox in config dialog. Since NONE is not
123		// used, we set -1 here.
124		NONE = -1;
125		CUSTOM = 0;
126		ATOK = 1;
127		MSIME = 2;
128		KOTOERI = 3;
129		MOBILE = 4;
130		CHROMEOS = 5;
131		};
132		optional SessionKeymap session_keymap = 41 [default = NONE];
133
134		// custom keymap
135		// TODO(taku): replace it with repeated field
136		optional bytes custom_keymap_table = 42;
137
138		// custom roman table
139		optional bytes custom_roman_table = 43;
140
141		enum PunctuationMethod {
142		KUTEN_TOUTEN = 0;
143		COMMA_PERIOD = 1;
144		KUTEN_PERIOD = 2;
145		COMMA_TOUTEN = 3;
146		};
147		optional PunctuationMethod punctuation_method = 45 [default = KUTEN_TOUTEN];
148
149		enum SymbolMethod {
150		CORNER_BRACKET_MIDDLE_DOT = 0;
151		SQUARE_BRACKET_SLASH = 1;
152		CORNER_BRACKET_SLASH = 2;
153		SQUARE_BRACKET_MIDDLE_DOT = 3;
154		};
155		optional SymbolMethod symbol_method = 46 [default = CORNER_BRACKET_MIDDLE_DOT];
156
157		enum FundamentalCharacterForm {
158		FUNDAMENTAL_INPUT_MODE = 0; // follow the input mode
159		FUNDAMENTAL_FULL_WIDTH = 1; // always FullWidth
160		FUNDAMENTAL_HALF_WIDTH = 2; // always HalfWidth
161		};
162		optional FundamentalCharacterForm space_character_form = 47 [ default = FUNDAMENTAL_INPUT_MODE ];
163
164		// If this flag is true, Mozc toggles preedit method with some predefined
165		// key events when IME is turned on. Otherwise, Mozc ignores such kind of
166		// key events so that their preferred can be preserved even when the toggle
167		// key is pressed by accident.
168		// As for Mozc, only Windows client supports such kind of toggle so this flag
169		// is currently valid only on Windows.
170		//
171		// Background:
172		// Traditional Japanese IMEs have used "Roma-Ji" key in Japanese 106/109
173		// keyboard to toggle the preedit method between Roman and Kana style and
174		// this behavior was finally adopted into JIS X 4064:2002 as a basic
175		// functionality which is expected to support by a Japanese Input Method.
176		// However, people who are not aware of this functionality have been
177		// puzzled because the default key stroke is likely to be pressed
178		// by accident.
179		optional bool use_keyboard_to_change_preedit_method = 48 [ default = false ];
180
181		// User history learning
182		enum HistoryLearningLevel {
183		DEFAULT_HISTORY = 0;
184		READ_ONLY = 1;
185		NO_HISTORY = 2;
186		};
187		optional HistoryLearningLevel history_learning_level = 50 [default = DEFAULT_HISTORY];
188
189		enum SelectionShortcut {
190		NO_SHORTCUT = 0;
191		SHORTCUT_123456789 = 1;
192		SHORTCUT_ASDFGHJKL = 2;
193		};
194		optional SelectionShortcut selection_shortcut = 52 [default = SHORTCUT_123456789];
195
196		// character form (Halfwidth/Fullwidth
197		enum CharacterForm {
198		HALF_WIDTH = 0;
199		FULL_WIDTH = 1;
200		LAST_FORM = 2;
201		NO_CONVERSION = 3;
202		};
203		message CharacterFormRule {
204		optional string group = 1;
205		optional CharacterForm preedit_character_form = 2 [ default = FULL_WIDTH ];
206		optional CharacterForm conversion_character_form = 3 [ default = FULL_WIDTH ];
207		};
208		repeated CharacterFormRule character_form_rules = 54;
209
210		// auto IME turn off feature
211		optional bool use_auto_ime_turn_off = 56 [ default = true ];
212
213		// Toggle to use cascanding window for debuging.
214		optional bool use_cascading_window = 58 [ default = true ];
215
216		// Shift key mode switch
217		enum ShiftKeyModeSwitch {
218		OFF = 0; // Case insensitive
219		ASCII_INPUT_MODE = 1; // MSIME, ATOK behavior
220		KATAKANA_INPUT_MODE = 2; // Kotoeri behavior
221		};
222		optional ShiftKeyModeSwitch shift_key_mode_switch = 59 [ default = ASCII_INPUT_MODE ];
223
224		enum NumpadCharacterForm {
225		NUMPAD_INPUT_MODE = 0;
226		NUMPAD_FULL_WIDTH = 1;
227		NUMPAD_HALF_WIDTH = 2;
228		NUMPAD_DIRECT_INPUT = 3;
229		};
230		optional NumpadCharacterForm numpad_character_form = 60 [ default = NUMPAD_HALF_WIDTH ];
231
232		enum AutoConversionKey {
233		AUTO_CONVERSION_OFF = 0;
234		AUTO_CONVERSION_KUTEN = 1;
235		AUTO_CONVERSION_TOUTEN = 2;
236		AUTO_CONVERSION_QUESTION_MARK = 4;
237		AUTO_CONVERSION_EXCLAMATION_MARK = 8;
238		};
239		optional bool use_auto_conversion = 61 [ default = false ];
240
241		// can't use AutoConversionKey as a type since
242		// undefined enum type is not correctly handled.
243		optional uint32 auto_conversion_key = 62 [ default = 13 ];
244
245		// Mac only config items: yen_sign_character and use_japanese_layout.
246		enum YenSignCharacter {
247		YEN_SIGN = 0;
248		BACKSLASH = 1;
249		};
250		// Mac-original JIS key layout has "yen-sign" key which generates
251		// U+00A5 instead of U+005C and sometimes users get troubles with
252		// them because they expect backslashes which are rendered as
253		// yen-sign. If this configuration is BACKSLASH, Mozc will
254		// interpret U+005C even when the original key event is U+00A5.
255		optional YenSignCharacter yen_sign_character = 63 [ default = YEN_SIGN ];
256
257		// Use Japanese keyboard layout even when the user uses other
258		// keyboard layouts. In Mac OSX people can use several keyboard
259		// layouts such like French or Spanish but some people want to use
260		// Japanese layout for Japanese. See http://b/2917320
261		optional bool use_japanese_layout = 64 [ default = false ];
262
263		// Use kana modifier insensitive conversion.
264		// e.g. かつこう -> 学校
265		// Note that Request message has the same field.
266		// - Request's one is controlled by the client. A user cannot control it.
267		// On the other hand Config's is under a user's control.
268		// - Whether the feature is activated or not is decided by logical-AND
269		// of Request's and Config's.
270		optional bool use_kana_modifier_insensitive_conversion = 65 [ default = false ];
271
272		// Use typing correction feature.
273		// e.g. sunkai -> 深海
274		optional bool use_typing_correction = 66 [ default = false ];
275
276		//////////////////////////////////////////////////////////////
277		//
278		// Dictionary (80-99)
279		//
280		optional bool use_date_conversion = 80 [ default = true ];
281		optional bool use_single_kanji_conversion = 81 [ default = true ];
282		optional bool use_symbol_conversion = 82 [ default = true ];
283		optional bool use_number_conversion = 83 [ default = true ];
284		optional bool use_emoticon_conversion = 84 [ default = true ];
285		optional bool use_calculator = 85 [ default = true ];
286		optional bool use_t13n_conversion = 86 [ default = true ];
287		optional bool use_zip_code_conversion = 87 [ default = true ];
288		optional bool use_spelling_correction = 88 [ default = true ];
289		optional bool use_emoji_conversion = 89 [ default = false ];
290
291		message InformationListConfig {
292		optional bool use_local_usage_dictionary = 1 [ default = true ];
293		};
294		optional InformationListConfig information_list_config = 90;
295
296		//////////////////////////////////////////////////////////////
297		//
298		// Suggest (100-119)
299		//
300		// Use history-based suggest feature.
301		optional bool use_history_suggest = 100 [ default = true ];
302
303		// Use dictionary-based suggest feature.
304		optional bool use_dictionary_suggest = 101 [ default = true ];
305
306		// Use realtime conversion feature.
307		optional bool use_realtime_conversion = 102 [ default = true ];
308
309		// Size of suggestions.
310		optional uint32 suggestions_size = 110 [ default = 3 ];
311
312		//////////////////////////////////////////////////////////////
313		//
314		// Renderer (120-139)
315		//
316		// Use mode indicator feature.
317		optional bool use_mode_indicator = 120 [ default = true ];
318
319		//////////////////////////////////////////////////////////////
320		//
321		// Cloud (300-319)
322		//
323		// Configuration for cloud sync feature. This field is obsolete.
324		optional OBSOLETE_SyncConfig OBSOLETE_sync_config = 300;
325
326		// Allow the cloud handwriting. The handwriting UI has to notice
327		// user before activating the feature, and set this field to true
328		// when the user permit.
329		// NOTE: OSS version does not handle this field.
330		optional bool allow_cloud_handwriting = 301 [ default = false ];
331
332		};

+1

-1

src/config/config_handler.cc less more

41	41	#include "base/system_util.h"
42	42	#include "base/util.h"
43	43	#include "base/version.h"
44		#include "config/config.pb.h"
	44	#include "protocol/config.pb.h"
45	45
46	46	namespace mozc {
47	47	namespace config {

+1

-1

src/config/config_handler.h less more

34	34	#include <string>
35	35
36	36	#include "base/port.h"
37		#include "config/config.pb.h"
	37	#include "protocol/config.pb.h"
38	38
39	39	namespace mozc {
40	40	namespace config {

+1

-1

src/config/config_handler_test.cc less more

40	40	#include "base/port.h"
41	41	#include "base/system_util.h"
42	42	#include "base/util.h"
43		#include "config/config.pb.h"
	43	#include "protocol/config.pb.h"
44	44	#include "testing/base/public/googletest.h"
45	45	#include "testing/base/public/gunit.h"
46	46

+1

-1

src/config/stats_config_util.cc less more

53	53
54	54	#if defined(OS_ANDROID) \|\| defined(__native_client__)
55	55	#include "config/config_handler.h"
56		#include "config/config.pb.h"
	56	#include "protocol/config.pb.h"
57	57	#endif // OS_ANDROID \|\| __native_client__
58	58
59	59	#include "base/file_util.h"

+1

-1

src/config/stats_config_util_test.cc less more

39	39
40	40	#ifdef OS_ANDROID
41	41	#include "config/config_handler.h"
42		#include "config/config.pb.h"
	42	#include "protocol/config.pb.h"
43	43
44	44	DECLARE_string(test_tmpdir);
45	45	#endif // OS_ANDROID

+1

-1

src/converter/converter_base.gyp less more

118	118	'dependencies': [
119	119	'../base/base.gyp:base',
120	120	'../config/config.gyp:config_handler',
121		'../config/config.gyp:config_protocol',
122	121	'../data_manager/data_manager.gyp:user_pos_manager',
123	122	'../dictionary/dictionary.gyp:suffix_dictionary',
124	123	'../dictionary/dictionary_base.gyp:pos_matcher',
125	124	'../dictionary/dictionary_base.gyp:suppression_dictionary',
126	125	'../protocol/protocol.gyp:commands_proto',
	126	'../protocol/protocol.gyp:config_proto',
127	127	'../rewriter/rewriter_base.gyp:gen_rewriter_files#host',
128	128	'connector',
129	129	'immutable_converter_interface',

+1

-1

src/converter/converter_main.cc less more

40	40	#include "base/util.h"
41	41	#include "composer/composer.h"
42	42	#include "composer/table.h"
43		#include "config/config.pb.h"
44	43	#include "converter/conversion_request.h"
45	44	#include "converter/converter_interface.h"
46	45	#include "converter/lattice.h"

50	49	#include "engine/engine_interface.h"
51	50	#include "engine/mock_data_engine_factory.h"
52	51	#include "protocol/commands.pb.h"
	52	#include "protocol/config.pb.h"
53	53
54	54	DEFINE_int32(max_conversion_candidates_size, 200, "maximum candidates size");
55	55	DEFINE_string(user_profile_dir, "", "path to user profile directory");

+1

-1

src/converter/converter_main.gyp less more

40	40	],
41	41	'dependencies': [
42	42	'../composer/composer.gyp:composer',
43		'../config/config.gyp:config_protocol',
44	43	'../engine/engine.gyp:oss_engine_factory',
45	44	'../engine/engine.gyp:engine',
46	45	'../engine/engine.gyp:engine_factory',
47	46	'../engine/engine.gyp:mock_data_engine_factory',
48	47	'../protocol/protocol.gyp:commands_proto',
	48	'../protocol/protocol.gyp:config_proto',
49	49	'converter.gyp:converter',
50	50	'converter_base.gyp:pos_id_printer',
51	51	'converter_base.gyp:segments',

+1

-1

src/converter/converter_regression_test.cc less more

33	33	#include "base/system_util.h"
34	34	#include "composer/composer.h"
35	35	#include "composer/table.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/conversion_request.h"
39	38	#include "converter/converter_interface.h"

41	40	#include "engine/engine_factory.h"
42	41	#include "engine/engine_interface.h"
43	42	#include "protocol/commands.pb.h"
	43	#include "protocol/config.pb.h"
44	44	#include "testing/base/public/gunit.h"
45	45
46	46	#ifdef OS_ANDROID

+1

-1

src/converter/converter_test.cc less more

38	38	#include "base/util.h"
39	39	#include "composer/composer.h"
40	40	#include "composer/table.h"
41		#include "config/config.pb.h"
42	41	#include "config/config_handler.h"
43	42	#include "converter/connector.h"
44	43	#include "converter/conversion_request.h"

70	69	#include "prediction/suggestion_filter.h"
71	70	#include "prediction/user_history_predictor.h"
72	71	#include "protocol/commands.pb.h"
	72	#include "protocol/config.pb.h"
73	73	#include "rewriter/rewriter.h"
74	74	#include "rewriter/rewriter_interface.h"
75	75	#include "testing/base/public/gunit.h"

+1

-1

src/converter/immutable_converter.cc less more

41	41	#include "base/stl_util.h"
42	42	#include "base/string_piece.h"
43	43	#include "base/util.h"
44		#include "config/config.pb.h"
45	44	#include "config/config_handler.h"
46	45	#include "converter/connector.h"
47	46	#include "converter/conversion_request.h"

59	58	#include "dictionary/suppression_dictionary.h"
60	59	#include "prediction/suggestion_filter.h"
61	60	#include "protocol/commands.pb.h"
	61	#include "protocol/config.pb.h"
62	62
63	63	using mozc::dictionary::DictionaryInterface;
64	64	using mozc::dictionary::POSMatcher;

+1

-1

src/converter/immutable_converter_test.cc less more

38	38	#include "base/string_piece.h"
39	39	#include "base/system_util.h"
40	40	#include "base/util.h"
41		#include "config/config.pb.h"
42	41	#include "config/config_handler.h"
43	42	#include "converter/connector.h"
44	43	#include "converter/conversion_request.h"

58	57	#include "dictionary/user_dictionary_stub.h"
59	58	#include "prediction/suggestion_filter.h"
60	59	#include "protocol/commands.pb.h"
	60	#include "protocol/config.pb.h"
61	61	#include "testing/base/public/gunit.h"
62	62
63	63	DECLARE_string(test_tmpdir);

+1

-1

src/converter/nbest_generator_test.cc less more

34	34	#include "base/port.h"
35	35	#include "base/scoped_ptr.h"
36	36	#include "base/system_util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "converter/connector.h"
40	39	#include "converter/conversion_request.h"

53	52	#include "dictionary/system/value_dictionary.h"
54	53	#include "dictionary/user_dictionary_stub.h"
55	54	#include "prediction/suggestion_filter.h"
	55	#include "protocol/config.pb.h"
56	56	#include "testing/base/public/gunit.h"
57	57
58	58	DECLARE_string(test_tmpdir);

+1

-1

src/converter/quality_regression_test.cc less more

36	36	#include "base/logging.h"
37	37	#include "base/port.h"
38	38	#include "base/system_util.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/quality_regression_util.h"
42	41	#include "engine/chromeos_engine_factory.h"
43	42	#include "engine/engine_factory.h"
44	43	#include "engine/engine_interface.h"
45	44	#include "protocol/commands.pb.h"
	45	#include "protocol/config.pb.h"
46	46	#include "session/request_test_util.h"
47	47	#include "testing/base/public/gunit.h"
48	48

+1

-1

src/converter/segments_test.cc less more

34	34	#include "base/number_util.h"
35	35	#include "base/system_util.h"
36	36	#include "base/util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
	38	#include "protocol/config.pb.h"
39	39	#include "testing/base/public/gunit.h"
40	40
41	41	DECLARE_string(test_tmpdir);

+1

-1

src/dictionary/dictionary.gyp less more

64	64	'dependencies': [
65	65	'../base/base.gyp:base',
66	66	'../config/config.gyp:config_handler',
67		'../config/config.gyp:config_protocol',
	67	'../protocol/protocol.gyp:config_proto',
68	68	'../protocol/protocol.gyp:user_dictionary_storage_proto',
69	69	'dictionary_base.gyp:pos_matcher',
70	70	'dictionary_base.gyp:suppression_dictionary',

+2

-1

src/dictionary/dictionary_base.gyp less more

172	172	'../base/base.gyp:base',
173	173	'../base/base.gyp:config_file_stream',
174	174	'../config/config.gyp:config_handler',
175		'../config/config.gyp:config_protocol',
	175	'../protocol/protocol.gyp:config_proto',
	176	'../protocol/protocol.gyp:user_dictionary_storage_proto',
176	177	'../protocol/protocol.gyp:user_dictionary_storage_proto',
177	178	'../usage_stats/usage_stats_base.gyp:usage_stats',
178	179	'gen_pos_map#host',

+1

-1

src/dictionary/dictionary_impl.cc less more

33	33	#include "base/logging.h"
34	34	#include "base/string_piece.h"
35	35	#include "base/util.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "dictionary/dictionary_interface.h"
39	38	#include "dictionary/dictionary_token.h"
40	39	#include "dictionary/pos_matcher.h"
41	40	#include "dictionary/suppression_dictionary.h"
	41	#include "protocol/config.pb.h"
42	42
43	43	namespace mozc {
44	44	namespace dictionary {

+1

-1

src/dictionary/dictionary_impl_test.cc less more

34	34	#include "base/port.h"
35	35	#include "base/system_util.h"
36	36	#include "base/util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "converter/node_allocator.h"
40	39	#include "data_manager/testing/mock_data_manager.h"

45	44	#include "dictionary/system/system_dictionary.h"
46	45	#include "dictionary/system/value_dictionary.h"
47	46	#include "dictionary/user_dictionary_stub.h"
	47	#include "protocol/config.pb.h"
48	48	#include "testing/base/public/gunit.h"
49	49
50	50	DECLARE_string(test_tmpdir);

+1

-1

src/dictionary/user_dictionary.cc less more

40	40	#include "base/stl_util.h"
41	41	#include "base/thread.h"
42	42	#include "base/util.h"
43		#include "config/config.pb.h"
44	43	#include "config/config_handler.h"
45	44	#include "dictionary/dictionary_token.h"
46	45	#include "dictionary/pos_matcher.h"

48	47	#include "dictionary/user_dictionary_storage.h"
49	48	#include "dictionary/user_dictionary_util.h"
50	49	#include "dictionary/user_pos.h"
	50	#include "protocol/config.pb.h"
51	51	#include "usage_stats/usage_stats.h"
52	52
53	53	namespace mozc {

+1

-1

src/dictionary/user_dictionary_test.cc less more

42	42	#include "base/system_util.h"
43	43	#include "base/trie.h"
44	44	#include "base/util.h"
45		#include "config/config.pb.h"
46	45	#include "config/config_handler.h"
47	46	#include "data_manager/testing/mock_user_pos_manager.h"
48	47	#include "dictionary/dictionary_test_util.h"

52	51	#include "dictionary/user_dictionary_storage.h"
53	52	#include "dictionary/user_pos.h"
54	53	#include "dictionary/user_pos_interface.h"
	54	#include "protocol/config.pb.h"
55	55	#include "testing/base/public/googletest.h"
56	56	#include "testing/base/public/gunit.h"
57	57	#include "usage_stats/usage_stats.h"

+1

-1

src/gui/character_pad/hand_writing.cc less more

40	40	#endif
41	41
42	42	#ifdef ENABLE_CLOUD_HANDWRITING
43		#include "config/config.pb.h"
44	43	#include "config/config_handler.h"
45	44	#include "handwriting/cloud_handwriting.h"
	45	#include "protocol/config.pb.h"
46	46	#endif // ENABLE_CLOUD_HANDWRITING
47	47
48	48	#include "base/logging.h"

+1

-1

src/gui/config_dialog/character_form_editor.h less more

32	32	#include <QtGui/QTableWidget>
33	33	#include "base/port.h"
34	34	#include "base/scoped_ptr.h"
35		#include "config/config.pb.h"
	35	#include "protocol/config.pb.h"
36	36
37	37	namespace mozc {
38	38	namespace config {

+1

-1

src/gui/config_dialog/config_dialog.cc less more

45	45	#include "base/run_level.h"
46	46	#include "base/util.h"
47	47	#include "client/client.h"
48		#include "config/config.pb.h"
49	48	#include "config/config_handler.h"
50	49	#include "config/stats_config_util.h"
51	50	#include "gui/base/win_util.h"

53	52	#include "gui/config_dialog/roman_table_editor.h"
54	53	#include "ipc/ipc.h"
55	54	#include "protocol/commands.pb.h"
	55	#include "protocol/config.pb.h"
56	56	#include "session/internal/keymap.h"
57	57
58	58	namespace {

+1

-1

src/gui/config_dialog/config_dialog.h less more

37	37	#include <string>
38	38	#include "base/port.h"
39	39	#include "base/scoped_ptr.h"
40		#include "config/config.pb.h"
41	40	#include "gui/config_dialog/ui_config_dialog.h"
	41	#include "protocol/config.pb.h"
42	42
43	43	namespace mozc {
44	44

+3

-3

src/gui/gui.gyp less more

477	477	'../client/client.gyp:client',
478	478	'../composer/composer.gyp:key_parser',
479	479	'../config/config.gyp:config_handler',
480		'../config/config.gyp:config_protocol',
481	480	'../config/config.gyp:stats_config_util',
482	481	'../protocol/protocol.gyp:commands_proto',
	482	'../protocol/protocol.gyp:config_proto',
483	483	'../session/session_base.gyp:keymap',
484	484	'gen_config_dialog_files',
485	485	],

592	592	'../base/base.gyp:base',
593	593	'../client/client.gyp:client',
594	594	'../config/config.gyp:config_handler',
595		'../config/config.gyp:config_protocol',
596	595	'../data_manager/data_manager.gyp:user_pos_manager',
597	596	'../dictionary/dictionary_base.gyp:user_dictionary',
598	597	'../protocol/protocol.gyp:commands_proto',
	598	'../protocol/protocol.gyp:config_proto',
599	599	'../protocol/protocol.gyp:user_dictionary_storage_proto',
600	600	'gen_config_dialog_files',
601	601	'gen_dictionary_tool_files',

808	808	],
809	809	'dependencies': [
810	810	'../client/client.gyp:client',
811		'../config/config.gyp:config_protocol',
812	811	'../ipc/ipc.gyp:ipc',
813	812	'../protocol/protocol.gyp:commands_proto',
	813	'../protocol/protocol.gyp:config_proto',
814	814	'gen_set_default_dialog_files',
815	815	],
816	816	'conditions': [

+1

-1

src/gui/set_default_dialog/set_default_dialog.cc less more

36	36	#include "base/logging.h"
37	37	#include "base/util.h"
38	38	#include "client/client.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
	40	#include "protocol/config.pb.h"
41	41
42	42	#ifdef OS_WIN
43	43	#include "win32/base/migration_util.h"

+1

-1

src/mac/GoogleJapaneseInputController.mm less more

50	50	#include "base/process.h"
51	51	#include "base/util.h"
52	52	#include "client/client.h"
53		#include "config/config.pb.h"
54	53	#include "ipc/ipc.h"
55	54	#include "protocol/commands.pb.h"
	55	#include "protocol/config.pb.h"
56	56	#include "renderer/renderer_client.h"
57	57	#include "session/ime_switch_util.h"
58	58

+1

-1

src/mac/mac.gyp less more

41	41	'../base/base.gyp:base',
42	42	'../client/client.gyp:client',
43	43	'../client/client.gyp:client_mock',
44		'../config/config.gyp:config_protocol',
45	44	'../protocol/protocol.gyp:commands_proto',
	45	'../protocol/protocol.gyp:config_proto',
46	46	'../protocol/protocol.gyp:renderer_proto',
47	47	'../renderer/renderer.gyp:renderer_client',
48	48	'../session/session_base.gyp:ime_switch_util',

+1

-1

src/mozc_version_template.txt less more

0	0	MAJOR=2
1	1	MINOR=17
2		BUILD=2103
	2	BUILD=2104
3	3	REVISION=102
4	4	# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
5	5	# downloaded by NaCl Mozc.

+1

-1

src/prediction/dictionary_predictor.cc less more

44	44	#include "base/number_util.h"
45	45	#include "base/util.h"
46	46	#include "composer/composer.h"
47		#include "config/config.pb.h"
48	47	#include "config/config_handler.h"
49	48	#include "converter/connector.h"
50	49	#include "converter/conversion_request.h"

60	59	#include "prediction/zero_query_data.h"
61	60	#include "prediction/zero_query_number_data.h"
62	61	#include "protocol/commands.pb.h"
	62	#include "protocol/config.pb.h"
63	63
64	64	// This flag is set by predictor.cc
65	65	// We can remove this after the ambiguity expansion feature get stable.

+1

-1

src/prediction/dictionary_predictor_test.cc less more

43	43	#include "composer/composer.h"
44	44	#include "composer/internal/typing_model.h"
45	45	#include "composer/table.h"
46		#include "config/config.pb.h"
47	46	#include "config/config_handler.h"
48	47	#include "converter/connector.h"
49	48	#include "converter/conversion_request.h"

66	65	#include "dictionary/system/system_dictionary.h"
67	66	#include "prediction/suggestion_filter.h"
68	67	#include "protocol/commands.pb.h"
	68	#include "protocol/config.pb.h"
69	69	#include "session/request_test_util.h"
70	70	#include "testing/base/public/gmock.h"
71	71	#include "testing/base/public/googletest.h"

+1

-1

src/prediction/prediction_test.gyp less more

43	43	'dependencies': [
44	44	'../composer/composer.gyp:composer',
45	45	'../config/config.gyp:config_handler',
46		'../config/config.gyp:config_protocol',
47	46	'../converter/converter_base.gyp:connector',
48	47	'../converter/converter_base.gyp:converter_mock',
49	48	'../converter/converter_base.gyp:immutable_converter',

58	57	'../dictionary/system/system_dictionary.gyp:system_dictionary',
59	58	'../dictionary/system/system_dictionary.gyp:value_dictionary',
60	59	'../protocol/protocol.gyp:commands_proto',
	60	'../protocol/protocol.gyp:config_proto',
61	61	'../session/session_base.gyp:request_test_util',
62	62	'../testing/testing.gyp:gtest_main',
63	63	'prediction.gyp:prediction',

+1

-1

src/prediction/predictor.cc less more

33	33
34	34	#include "base/flags.h"
35	35	#include "base/logging.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/segments.h"
39	38	#include "protocol/commands.pb.h"
	39	#include "protocol/config.pb.h"
40	40
41	41	DECLARE_bool(enable_expansion_for_dictionary_predictor);
42	42	DECLARE_bool(enable_expansion_for_user_history_predictor);

+1

-1

src/prediction/predictor_test.cc less more

35	35	#include "base/singleton.h"
36	36	#include "base/system_util.h"
37	37	#include "composer/composer.h"
38		#include "config/config.pb.h"
39	38	#include "config/config_handler.h"
40	39	#include "converter/conversion_request.h"
41	40	#include "converter/segments.h"

45	44	#include "prediction/predictor_interface.h"
46	45	#include "prediction/user_history_predictor.h"
47	46	#include "protocol/commands.pb.h"
	47	#include "protocol/config.pb.h"
48	48	#include "session/request_test_util.h"
49	49	#include "testing/base/public/gmock.h"
50	50	#include "testing/base/public/googletest.h"

+1

-1

src/prediction/user_history_predictor.cc less more

41	41	#include "base/trie.h"
42	42	#include "base/util.h"
43	43	#include "composer/composer.h"
44		#include "config/config.pb.h"
45	44	#include "config/config_handler.h"
46	45	#include "converter/conversion_request.h"
47	46	#include "converter/segments.h"

51	50	#include "prediction/predictor_interface.h"
52	51	#include "prediction/user_history_predictor.pb.h"
53	52	#include "protocol/commands.pb.h"
	53	#include "protocol/config.pb.h"
54	54	#include "rewriter/variants_rewriter.h"
55	55	#include "storage/encrypted_string_storage.h"
56	56	#include "storage/lru_cache.h"

+1

-1

src/prediction/user_history_predictor_test.cc less more

40	40	#include "base/util.h"
41	41	#include "composer/composer.h"
42	42	#include "composer/table.h"
43		#include "config/config.pb.h"
44	43	#include "config/config_handler.h"
45	44	#include "converter/conversion_request.h"
46	45	#include "converter/segments.h"

48	47	#include "dictionary/dictionary_mock.h"
49	48	#include "dictionary/suppression_dictionary.h"
50	49	#include "protocol/commands.pb.h"
	50	#include "protocol/config.pb.h"
51	51	#include "session/request_test_util.h"
52	52	#include "testing/base/public/googletest.h"
53	53	#include "testing/base/public/gunit.h"

+1

-1

src/protocol/commands.proto less more

34	34
35	35	syntax = "proto2";
36	36
37		import "config/config.proto";
38	37	import "protocol/candidates.proto";
	38	import "protocol/config.proto";
39	39	import "protocol/user_dictionary_storage.proto";
40	40
41	41	package mozc.commands;

+333

-0

src/protocol/config.proto less more

	0	// Copyright 2010-2015, Google Inc.
	1	// All rights reserved.
	2	//
	3	// Redistribution and use in source and binary forms, with or without
	4	// modification, are permitted provided that the following conditions are
	5	// met:
	6	//
	7	// * Redistributions of source code must retain the above copyright
	8	// notice, this list of conditions and the following disclaimer.
	9	// * Redistributions in binary form must reproduce the above
	10	// copyright notice, this list of conditions and the following disclaimer
	11	// in the documentation and/or other materials provided with the
	12	// distribution.
	13	// * Neither the name of Google Inc. nor the names of its
	14	// contributors may be used to endorse or promote products derived from
	15	// this software without specific prior written permission.
	16	//
	17	// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	18	// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	19	// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
	20	// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	21	// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
	22	// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	23	// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
	24	// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
	25	// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	26	// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
	27	// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	28
	29	// Protocol messages to be used for mozc configuration.
	30	syntax = "proto2";
	31
	32	package mozc.config;
	33
	34	option java_outer_classname = "ProtoConfig";
	35	option java_package = "org.mozc.android.inputmethod.japanese.protobuf";
	36
	37	message GeneralConfig {
	38	//////////////////////////////////////////////////////////////
	39	//
	40	// General config (1-9)
	41	//
	42
	43	// config version, corresponding to the suffix of config file
	44	optional uint32 config_version = 1 [ default = 0 ];
	45
	46	// The product version that wrote this config
	47	optional string last_modified_product_version = 2 [ default = "0.0.0.0" ];
	48
	49	// last modified time in UTC second
	50	optional uint64 last_modified_time = 3 [ default = 0 ];
	51
	52	// These fileds are not used now
	53	// platform of machine that wrote this config
	54	optional string platform = 4 [ default = "" ];
	55
	56	// UI locale of machine that wrote this config
	57	optional string ui_locale = 5 [ default = "" ];
	58
	59	// Whether to upload usage stats
	60	// This flag is used only for Android.
	61	optional bool upload_usage_stats = 6 [default = false];
	62	};
	63
	64	message OBSOLETE_SyncConfig {
	65	optional bool use_config_sync = 1 [ default = false ];
	66	optional bool use_user_dictionary_sync = 2 [ default = false ];
	67	optional bool use_user_history_sync = 3 [ default = false ];
	68	optional bool use_learning_preference_sync = 4 [ default = false ];
	69	optional bool use_contact_list_sync = 5 [ default = false ];
	70	};
	71
	72	message Config {
	73	// General config and logging/debugging:
	74	// We won't use 2-9 and 20-39 ids anymore for historical reasons.
	75	optional GeneralConfig general_config = 1;
	76
	77	//////////////////////////////////////////////////////////////
	78	//
	79	// Logging/Debugging (10-19)
	80	//
	81
	82	// set verbose level of logging library (FLAGS_v)
	83	optional int32 verbose_level = 10 [ default = 0 ];
	84
	85	// This flag is not used
	86	optional bool DEPRECATED_log_all_commands = 11 [ default = false ];
	87
	88	//////////////////////////////////////////////////////////////
	89	//
	90	// Misc fields (20-39)
	91	//
	92
	93	// Incognito mode:
	94	// Disable all mutable operation if incognito_mode is true
	95	optional bool incognito_mode = 20 [default = false];
	96
	97	// whether to show the set default dialog on startup
	98	optional bool check_default = 22 [ default = true ];
	99
	100	// Presentation mode:
	101	// disable all suggestion temporally.
	102	optional bool presentation_mode = 23 [ default = false ];
	103
	104	//////////////////////////////////////////////////////////////
	105	//
	106	// Basic features (40-79)
	107	//
	108	enum PreeditMethod {
	109	ROMAN = 0;
	110	KANA = 1;
	111	};
	112
	113	// Roman/Kana
	114	optional PreeditMethod preedit_method = 40 [default = ROMAN];
	115
	116	enum SessionKeymap {
	117	// If NONE is selected, it will be replaced with MSIME or KOTOERI.
	118	// NONE is used only for a placeholder, so a configuration program
	119	// should not show NONE as one of selections. NONE should be the
	120	// last of the items due to the limitation of the Qt GUI's
	121	// implementation. Note that keymap number should be correspoinding
	122	// to the index of QComboBox in config dialog. Since NONE is not
	123	// used, we set -1 here.
	124	NONE = -1;
	125	CUSTOM = 0;
	126	ATOK = 1;
	127	MSIME = 2;
	128	KOTOERI = 3;
	129	MOBILE = 4;
	130	CHROMEOS = 5;
	131	};
	132	optional SessionKeymap session_keymap = 41 [default = NONE];
	133
	134	// custom keymap
	135	// TODO(taku): replace it with repeated field
	136	optional bytes custom_keymap_table = 42;
	137
	138	// custom roman table
	139	optional bytes custom_roman_table = 43;
	140
	141	enum PunctuationMethod {
	142	KUTEN_TOUTEN = 0;
	143	COMMA_PERIOD = 1;
	144	KUTEN_PERIOD = 2;
	145	COMMA_TOUTEN = 3;
	146	};
	147	optional PunctuationMethod punctuation_method = 45 [default = KUTEN_TOUTEN];
	148
	149	enum SymbolMethod {
	150	CORNER_BRACKET_MIDDLE_DOT = 0;
	151	SQUARE_BRACKET_SLASH = 1;
	152	CORNER_BRACKET_SLASH = 2;
	153	SQUARE_BRACKET_MIDDLE_DOT = 3;
	154	};
	155	optional SymbolMethod symbol_method = 46 [default = CORNER_BRACKET_MIDDLE_DOT];
	156
	157	enum FundamentalCharacterForm {
	158	FUNDAMENTAL_INPUT_MODE = 0; // follow the input mode
	159	FUNDAMENTAL_FULL_WIDTH = 1; // always FullWidth
	160	FUNDAMENTAL_HALF_WIDTH = 2; // always HalfWidth
	161	};
	162	optional FundamentalCharacterForm space_character_form = 47 [ default = FUNDAMENTAL_INPUT_MODE ];
	163
	164	// If this flag is true, Mozc toggles preedit method with some predefined
	165	// key events when IME is turned on. Otherwise, Mozc ignores such kind of
	166	// key events so that their preferred can be preserved even when the toggle
	167	// key is pressed by accident.
	168	// As for Mozc, only Windows client supports such kind of toggle so this flag
	169	// is currently valid only on Windows.
	170	//
	171	// Background:
	172	// Traditional Japanese IMEs have used "Roma-Ji" key in Japanese 106/109
	173	// keyboard to toggle the preedit method between Roman and Kana style and
	174	// this behavior was finally adopted into JIS X 4064:2002 as a basic
	175	// functionality which is expected to support by a Japanese Input Method.
	176	// However, people who are not aware of this functionality have been
	177	// puzzled because the default key stroke is likely to be pressed
	178	// by accident.
	179	optional bool use_keyboard_to_change_preedit_method = 48 [ default = false ];
	180
	181	// User history learning
	182	enum HistoryLearningLevel {
	183	DEFAULT_HISTORY = 0;
	184	READ_ONLY = 1;
	185	NO_HISTORY = 2;
	186	};
	187	optional HistoryLearningLevel history_learning_level = 50 [default = DEFAULT_HISTORY];
	188
	189	enum SelectionShortcut {
	190	NO_SHORTCUT = 0;
	191	SHORTCUT_123456789 = 1;
	192	SHORTCUT_ASDFGHJKL = 2;
	193	};
	194	optional SelectionShortcut selection_shortcut = 52 [default = SHORTCUT_123456789];
	195
	196	// character form (Halfwidth/Fullwidth
	197	enum CharacterForm {
	198	HALF_WIDTH = 0;
	199	FULL_WIDTH = 1;
	200	LAST_FORM = 2;
	201	NO_CONVERSION = 3;
	202	};
	203	message CharacterFormRule {
	204	optional string group = 1;
	205	optional CharacterForm preedit_character_form = 2 [ default = FULL_WIDTH ];
	206	optional CharacterForm conversion_character_form = 3 [ default = FULL_WIDTH ];
	207	};
	208	repeated CharacterFormRule character_form_rules = 54;
	209
	210	// auto IME turn off feature
	211	optional bool use_auto_ime_turn_off = 56 [ default = true ];
	212
	213	// Toggle to use cascanding window for debuging.
	214	optional bool use_cascading_window = 58 [ default = true ];
	215
	216	// Shift key mode switch
	217	enum ShiftKeyModeSwitch {
	218	OFF = 0; // Case insensitive
	219	ASCII_INPUT_MODE = 1; // MSIME, ATOK behavior
	220	KATAKANA_INPUT_MODE = 2; // Kotoeri behavior
	221	};
	222	optional ShiftKeyModeSwitch shift_key_mode_switch = 59 [ default = ASCII_INPUT_MODE ];
	223
	224	enum NumpadCharacterForm {
	225	NUMPAD_INPUT_MODE = 0;
	226	NUMPAD_FULL_WIDTH = 1;
	227	NUMPAD_HALF_WIDTH = 2;
	228	NUMPAD_DIRECT_INPUT = 3;
	229	};
	230	optional NumpadCharacterForm numpad_character_form = 60 [ default = NUMPAD_HALF_WIDTH ];
	231
	232	enum AutoConversionKey {
	233	AUTO_CONVERSION_OFF = 0;
	234	AUTO_CONVERSION_KUTEN = 1;
	235	AUTO_CONVERSION_TOUTEN = 2;
	236	AUTO_CONVERSION_QUESTION_MARK = 4;
	237	AUTO_CONVERSION_EXCLAMATION_MARK = 8;
	238	};
	239	optional bool use_auto_conversion = 61 [ default = false ];
	240
	241	// can't use AutoConversionKey as a type since
	242	// undefined enum type is not correctly handled.
	243	optional uint32 auto_conversion_key = 62 [ default = 13 ];
	244
	245	// Mac only config items: yen_sign_character and use_japanese_layout.
	246	enum YenSignCharacter {
	247	YEN_SIGN = 0;
	248	BACKSLASH = 1;
	249	};
	250	// Mac-original JIS key layout has "yen-sign" key which generates
	251	// U+00A5 instead of U+005C and sometimes users get troubles with
	252	// them because they expect backslashes which are rendered as
	253	// yen-sign. If this configuration is BACKSLASH, Mozc will
	254	// interpret U+005C even when the original key event is U+00A5.
	255	optional YenSignCharacter yen_sign_character = 63 [ default = YEN_SIGN ];
	256
	257	// Use Japanese keyboard layout even when the user uses other
	258	// keyboard layouts. In Mac OSX people can use several keyboard
	259	// layouts such like French or Spanish but some people want to use
	260	// Japanese layout for Japanese. See http://b/2917320
	261	optional bool use_japanese_layout = 64 [ default = false ];
	262
	263	// Use kana modifier insensitive conversion.
	264	// e.g. かつこう -> 学校
	265	// Note that Request message has the same field.
	266	// - Request's one is controlled by the client. A user cannot control it.
	267	// On the other hand Config's is under a user's control.
	268	// - Whether the feature is activated or not is decided by logical-AND
	269	// of Request's and Config's.
	270	optional bool use_kana_modifier_insensitive_conversion = 65 [ default = false ];
	271
	272	// Use typing correction feature.
	273	// e.g. sunkai -> 深海
	274	optional bool use_typing_correction = 66 [ default = false ];
	275
	276	//////////////////////////////////////////////////////////////
	277	//
	278	// Dictionary (80-99)
	279	//
	280	optional bool use_date_conversion = 80 [ default = true ];
	281	optional bool use_single_kanji_conversion = 81 [ default = true ];
	282	optional bool use_symbol_conversion = 82 [ default = true ];
	283	optional bool use_number_conversion = 83 [ default = true ];
	284	optional bool use_emoticon_conversion = 84 [ default = true ];
	285	optional bool use_calculator = 85 [ default = true ];
	286	optional bool use_t13n_conversion = 86 [ default = true ];
	287	optional bool use_zip_code_conversion = 87 [ default = true ];
	288	optional bool use_spelling_correction = 88 [ default = true ];
	289	optional bool use_emoji_conversion = 89 [ default = false ];
	290
	291	message InformationListConfig {
	292	optional bool use_local_usage_dictionary = 1 [ default = true ];
	293	};
	294	optional InformationListConfig information_list_config = 90;
	295
	296	//////////////////////////////////////////////////////////////
	297	//
	298	// Suggest (100-119)
	299	//
	300	// Use history-based suggest feature.
	301	optional bool use_history_suggest = 100 [ default = true ];
	302
	303	// Use dictionary-based suggest feature.
	304	optional bool use_dictionary_suggest = 101 [ default = true ];
	305
	306	// Use realtime conversion feature.
	307	optional bool use_realtime_conversion = 102 [ default = true ];
	308
	309	// Size of suggestions.
	310	optional uint32 suggestions_size = 110 [ default = 3 ];
	311
	312	//////////////////////////////////////////////////////////////
	313	//
	314	// Renderer (120-139)
	315	//
	316	// Use mode indicator feature.
	317	optional bool use_mode_indicator = 120 [ default = true ];
	318
	319	//////////////////////////////////////////////////////////////
	320	//
	321	// Cloud (300-319)
	322	//
	323	// Configuration for cloud sync feature. This field is obsolete.
	324	optional OBSOLETE_SyncConfig OBSOLETE_sync_config = 300;
	325
	326	// Allow the cloud handwriting. The handwriting UI has to notice
	327	// user before activating the feature, and set this field to true
	328	// when the user permit.
	329	// NOTE: OSS version does not handle this field.
	330	optional bool allow_cloud_handwriting = 301 [ default = false ];
	331
	332	};

+30

-7

src/protocol/protocol.gyp less more

26	26	# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27	27	# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	28
29		# session_base.gyp defines targets for lower layers to link to the session
30		# modules, so modules in lower layers do not depend on ones in higher layers,
31		# avoiding circular dependencies.
32	29	{
33	30	'variables': {
34	31	'relative_dir': 'protocol',

46	43	'../protobuf/genproto.gypi',
47	44	],
48	45	'dependencies': [
49		'../config/config.gyp:genproto_config',
	46	'genproto_config_proto',
50	47	],
51	48	},
52	49	{

75	72	'../protobuf/genproto.gypi',
76	73	],
77	74	'dependencies': [
78		'../config/config.gyp:genproto_config',
	75	'genproto_config_proto',
79	76	'genproto_user_dictionary_storage_proto',
80	77	],
81	78	},

87	84	'<(proto_out_dir)/<(relative_dir)/commands.pb.cc',
88	85	],
89	86	'dependencies': [
90		'../config/config.gyp:config_protocol',
91	87	'../protobuf/protobuf.gyp:protobuf',
92	88	'candidates_proto',
	89	'config_proto',
93	90	'genproto_commands_proto#host',
94	91	'user_dictionary_storage_proto',
95	92	],

98	95	],
99	96	},
100	97	{
	98	'target_name': 'genproto_config_proto',
	99	'type': 'none',
	100	'toolsets': ['host'],
	101	'sources': [
	102	'config.proto',
	103	],
	104	'includes': [
	105	'../protobuf/genproto.gypi',
	106	],
	107	},
	108	{
	109	'target_name': 'config_proto',
	110	'type': 'static_library',
	111	'hard_dependency': 1,
	112	'sources': [
	113	'<(proto_out_dir)/<(relative_dir)/config.pb.cc',
	114	],
	115	'dependencies': [
	116	'../protobuf/protobuf.gyp:protobuf',
	117	'genproto_config_proto#host',
	118	],
	119	'export_dependent_settings': [
	120	'genproto_config_proto#host',
	121	],
	122	},
	123	{
101	124	'target_name': 'genproto_renderer_proto',
102	125	'type': 'none',
103	126	'toolsets': ['host'],

118	141	'<(proto_out_dir)/<(relative_dir)/renderer_style.pb.cc',
119	142	],
120	143	'dependencies': [
121		'../config/config.gyp:config_protocol',
122	144	'../protobuf/protobuf.gyp:protobuf',
123	145	'commands_proto',
	146	'config_proto',
124	147	'genproto_renderer_proto#host'
125	148	],
126	149	'export_dependent_settings': [

+6

-6

src/renderer/renderer.gyp less more

67	67	],
68	68	'dependencies': [
69	69	'../base/base.gyp:base',
70		'../config/config.gyp:config_protocol',
71	70	'../ipc/ipc.gyp:ipc',
72	71	'../protocol/protocol.gyp:commands_proto',
	72	'../protocol/protocol.gyp:config_proto',
73	73	'../protocol/protocol.gyp:renderer_proto',
74	74	],
75	75	},

229	229	],
230	230	'dependencies': [
231	231	'../base/base.gyp:base',
232		'../config/config.gyp:config_protocol',
233	232	'../protocol/protocol.gyp:commands_proto',
	233	'../protocol/protocol.gyp:config_proto',
234	234	'../protocol/protocol.gyp:renderer_proto',
235	235	],
236	236	},

257	257	],
258	258	'dependencies': [
259	259	'../base/base.gyp:base',
260		'../config/config.gyp:config_protocol',
261	260	'../protocol/protocol.gyp:commands_proto',
	261	'../protocol/protocol.gyp:config_proto',
262	262	'../protocol/protocol.gyp:renderer_proto',
263	263	'win32_font_util',
264	264	],

378	378	'../base/base.gyp:base',
379	379	'../base/base.gyp:crash_report_handler',
380	380	'../client/client.gyp:client',
381		'../config/config.gyp:config_protocol',
382	381	'../config/config.gyp:stats_config_util',
383	382	'../ipc/ipc.gyp:ipc',
384	383	'../protocol/protocol.gyp:commands_proto',
	384	'../protocol/protocol.gyp:config_proto',
385	385	'../protocol/protocol.gyp:renderer_proto',
386	386	'gen_mozc_renderer_resource_header#host',
387	387	'renderer_server',

439	439	'../base/base.gyp:base',
440	440	'../base/base.gyp:crash_report_handler',
441	441	'../client/client.gyp:client',
442		'../config/config.gyp:config_protocol',
443	442	'../config/config.gyp:stats_config_util',
444	443	'../ipc/ipc.gyp:ipc',
445	444	'../protocol/protocol.gyp:commands_proto',
	445	'../protocol/protocol.gyp:config_proto',
446	446	'../protocol/protocol.gyp:renderer_proto',
447	447	'gen_renderer_files#host',
448	448	'renderer_server',

545	545	'dependencies': [
546	546	'../base/base.gyp:base',
547	547	'../client/client.gyp:client',
548		'../config/config.gyp:genproto_config#host',
549	548	'../config/config.gyp:stats_config_util',
550	549	'../ipc/ipc.gyp:ipc',
	550	'../protocol/protocol.gyp:genproto_config_proto#host',
551	551	'../protocol/protocol.gyp:renderer_proto',
552	552	'gtk2_build_environment',
553	553	'renderer_server',

+1

-1

src/renderer/renderer_server.cc less more

40	40	#include "base/port.h"
41	41	#include "base/system_util.h"
42	42	#include "client/client_interface.h"
43		#include "config/config.pb.h" // for Config
44	43	#include "config/config_handler.h"
45	44	#include "ipc/ipc.h"
46	45	#include "ipc/named_event.h"
47	46	#include "ipc/process_watch_dog.h"
	47	#include "protocol/config.pb.h"
48	48	#include "protocol/renderer_command.pb.h"
49	49	#include "renderer/renderer_interface.h"
50	50

+2

-2

src/rewriter/calculator_rewriter.cc less more

33	33
34	34	#include "base/logging.h"
35	35	#include "base/util.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/conversion_request.h"
39	38	#include "converter/converter_interface.h"
40	39	#include "converter/segments.h"
	40	#include "protocol/commands.pb.h"
	41	#include "protocol/config.pb.h"
41	42	#include "rewriter/calculator/calculator_interface.h"
42		#include "protocol/commands.pb.h"
43	43
44	44	namespace mozc {
45	45

+1

-1

src/rewriter/calculator_rewriter_test.cc less more

33	33	#include "base/logging.h"
34	34	#include "base/scoped_ptr.h"
35	35	#include "base/system_util.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/conversion_request.h"
39	38	#include "converter/converter_interface.h"

42	41	#include "engine/engine_interface.h"
43	42	#include "engine/mock_data_engine_factory.h"
44	43	#include "protocol/commands.pb.h"
	44	#include "protocol/config.pb.h"
45	45	#include "rewriter/calculator/calculator_interface.h"
46	46	#include "rewriter/calculator/calculator_mock.h"
47	47	#include "testing/base/public/gunit.h"

+1

-1

src/rewriter/collocation_rewriter_test.cc less more

33	33
34	34	#include "base/logging.h"
35	35	#include "base/system_util.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/conversion_request.h"
39	38	#include "data_manager/testing/mock_data_manager.h"
40	39	#include "dictionary/pos_matcher.h"
	40	#include "protocol/config.pb.h"
41	41	#include "testing/base/public/gunit.h"
42	42
43	43	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/command_rewriter.cc less more

33	33	#include <vector>
34	34
35	35	#include "base/logging.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/conversion_request.h"
39	38	#include "converter/segments.h"
	39	#include "protocol/config.pb.h"
40	40
41	41	namespace mozc {
42	42	namespace {

+2

-2

src/rewriter/command_rewriter_test.cc less more

31	31	#include <string>
32	32
33	33	#include "base/system_util.h"
	34	#include "config/config_handler.h"
34	35	#include "converter/conversion_request.h"
35	36	#include "converter/segments.h"
	37	#include "protocol/config.pb.h"
36	38	#include "testing/base/public/gunit.h"
37		#include "config/config_handler.h"
38		#include "config/config.pb.h"
39	39
40	40	DECLARE_string(test_tmpdir);
41	41

+1

-1

src/rewriter/correction_rewriter.cc less more

34	34
35	35	#include "base/logging.h"
36	36	#include "base/util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "converter/conversion_request.h"
40	39	#include "converter/segments.h"
41	40	#include "data_manager/data_manager_interface.h"
	41	#include "protocol/config.pb.h"
42	42
43	43	namespace mozc {
44	44	namespace {

+1

-1

src/rewriter/correction_rewriter_test.cc less more

29	29	#include "rewriter/correction_rewriter.h"
30	30
31	31	#include <string>
32		#include "config/config.pb.h"
33	32	#include "config/config_handler.h"
34	33	#include "converter/conversion_request.h"
35	34	#include "converter/segments.h"
	35	#include "protocol/config.pb.h"
36	36	#include "testing/base/public/gunit.h"
37	37
38	38	namespace mozc {

+1

-1

src/rewriter/date_rewriter.cc less more

47	47	#include "base/util.h"
48	48	#include "composer/composer.h"
49	49	#include "composer/table.h"
50		#include "config/config.pb.h"
51	50	#include "config/config_handler.h"
52	51	#include "converter/conversion_request.h"
53	52	#include "converter/segments.h"
54	53	#include "protocol/commands.pb.h"
	54	#include "protocol/config.pb.h"
55	55
56	56	namespace mozc {
57	57

+1

-1

src/rewriter/date_rewriter_test.cc less more

38	38	#include "composer/composer.h"
39	39	#include "composer/table.h"
40	40	#include "config/config_handler.h"
41		#include "config/config.pb.h"
42	41	#include "converter/conversion_request.h"
43	42	#include "converter/segments.h"
44	43	#include "protocol/commands.pb.h"
	44	#include "protocol/config.pb.h"
45	45	#include "testing/base/public/gunit.h"
46	46
47	47	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/emoji_rewriter.cc less more

37	37	#include "base/iterator_adapter.h"
38	38	#include "base/logging.h"
39	39	#include "base/util.h"
40		#include "config/config.pb.h"
41	40	#include "config/config_handler.h"
42	41	#include "converter/conversion_request.h"
43	42	#include "converter/segments.h"
44	43	#include "protocol/commands.pb.h"
	44	#include "protocol/config.pb.h"
45	45	#include "usage_stats/usage_stats.h"
46	46
47	47	// EmojiRewriter:

+1

-1

src/rewriter/emoji_rewriter_test.cc less more

35	35	#include "base/number_util.h"
36	36	#include "base/system_util.h"
37	37	#include "base/util.h"
38		#include "config/config.pb.h"
39	38	#include "config/config_handler.h"
40	39	#include "converter/conversion_request.h"
41	40	#include "converter/segments.h"
42	41	#include "data_manager/user_pos_manager.h"
43	42	#include "dictionary/pos_matcher.h"
44	43	#include "protocol/commands.pb.h"
	44	#include "protocol/config.pb.h"
45	45	#include "rewriter/variants_rewriter.h"
46	46	#include "testing/base/public/gunit.h"
47	47	#include "usage_stats/usage_stats.h"

+1

-1

src/rewriter/emoticon_rewriter.cc less more

36	36	#include "base/logging.h"
37	37	#include "base/singleton.h"
38	38	#include "base/util.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/conversion_request.h"
42	41	#include "converter/segments.h"
43	42	#include "protocol/commands.pb.h"
	43	#include "protocol/config.pb.h"
44	44	#include "rewriter/embedded_dictionary.h"
45	45	#include "rewriter/rewriter_interface.h"
46	46

+1

-1

src/rewriter/emoticon_rewriter_test.cc less more

34	34	#include "base/logging.h"
35	35	#include "base/system_util.h"
36	36	#include "base/util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "converter/conversion_request.h"
40	39	#include "converter/segments.h"
41	40	#include "protocol/commands.pb.h"
	41	#include "protocol/config.pb.h"
42	42	#include "testing/base/public/gunit.h"
43	43
44	44	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/focus_candidate_rewriter_test.cc less more

34	34	#include "base/number_util.h"
35	35	#include "base/scoped_ptr.h"
36	36	#include "base/system_util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "converter/segments.h"
40	39	#include "data_manager/testing/mock_data_manager.h"
	40	#include "protocol/config.pb.h"
41	41	#include "testing/base/public/googletest.h"
42	42	#include "testing/base/public/gunit.h"
43	43	#include "transliteration/transliteration.h"

+1

-1

src/rewriter/language_aware_rewriter.cc less more

33	33	#include "base/logging.h"
34	34	#include "base/util.h"
35	35	#include "composer/composer.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/conversion_request.h"
39	38	#include "converter/segments.h"
40	39	#include "dictionary/dictionary_interface.h"
41	40	#include "dictionary/pos_matcher.h"
42	41	#include "protocol/commands.pb.h"
	42	#include "protocol/config.pb.h"
43	43	#include "usage_stats/usage_stats.h"
44	44
45	45	using mozc::dictionary::DictionaryInterface;

+1

-1

src/rewriter/language_aware_rewriter_test.cc less more

36	36	#include "base/util.h"
37	37	#include "composer/composer.h"
38	38	#include "composer/table.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/conversion_request.h"
42	41	#include "converter/segments.h"

48	47	#include "dictionary/dictionary_mock.h"
49	48	#include "dictionary/pos_matcher.h"
50	49	#include "protocol/commands.pb.h"
	50	#include "protocol/config.pb.h"
51	51	#include "testing/base/public/gunit.h"
52	52	#include "usage_stats/usage_stats.h"
53	53	#include "usage_stats/usage_stats_testing_util.h"

+1

-1

src/rewriter/merger_rewriter.h less more

32	32	#include <vector>
33	33
34	34	#include "base/stl_util.h"
35		#include "config/config.pb.h"
36	35	#include "config/config_handler.h"
37	36	#include "converter/conversion_request.h"
38	37	#include "converter/segments.h"
39	38	#include "protocol/commands.pb.h"
	39	#include "protocol/config.pb.h"
40	40	#include "rewriter/rewriter_interface.h"
41	41
42	42	namespace mozc {

+1

-1

src/rewriter/merger_rewriter_test.cc less more

31	31	#include <string>
32	32
33	33	#include "base/system_util.h"
34		#include "config/config.pb.h"
35	34	#include "config/config_handler.h"
36	35	#include "converter/conversion_request.h"
37	36	#include "converter/segments.h"
	37	#include "protocol/config.pb.h"
38	38	#include "testing/base/public/gunit.h"
39	39
40	40	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/number_rewriter.cc less more

37	37	#include "base/logging.h"
38	38	#include "base/number_util.h"
39	39	#include "base/util.h"
40		#include "config/config.pb.h"
41	40	#include "config/config_handler.h"
42	41	#include "converter/conversion_request.h"
43	42	#include "converter/segments.h"
44	43	#include "data_manager/data_manager_interface.h"
45	44	#include "dictionary/pos_matcher.h"
46	45	#include "protocol/commands.pb.h"
	46	#include "protocol/config.pb.h"
47	47	#include "rewriter/number_compound_util.h"
48	48
49	49	using mozc::dictionary::POSMatcher;

+1

-1

src/rewriter/number_rewriter_test.cc less more

35	35	#include "base/port.h"
36	36	#include "base/system_util.h"
37	37	#include "base/util.h"
38		#include "config/config.pb.h"
39	38	#include "config/config_handler.h"
40	39	#include "converter/conversion_request.h"
41	40	#include "converter/segments.h"

46	45	#include "data_manager/testing/mock_data_manager.h"
47	46	#include "dictionary/pos_matcher.h"
48	47	#include "protocol/commands.pb.h"
	48	#include "protocol/config.pb.h"
49	49	#include "testing/base/public/gunit.h"
50	50
51	51	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/rewriter.gyp less more

82	82	'../composer/composer.gyp:composer',
83	83	'../config/config.gyp:character_form_manager',
84	84	'../config/config.gyp:config_handler',
85		'../config/config.gyp:config_protocol',
86	85	'../converter/converter_base.gyp:conversion_request',
87	86	'../converter/converter_base.gyp:immutable_converter',
88	87	'../data_manager/data_manager.gyp:user_pos_manager',
89	88	'../dictionary/dictionary.gyp:dictionary',
90	89	'../dictionary/dictionary_base.gyp:pos_matcher',
91	90	'../protocol/protocol.gyp:commands_proto',
	91	'../protocol/protocol.gyp:config_proto',
92	92	'../storage/storage.gyp:storage',
93	93	'../usage_stats/usage_stats_base.gyp:usage_stats',
94	94	'calculator/calculator.gyp:calculator',

+1

-1

src/rewriter/rewriter_test.cc less more

32	32	#include <string>
33	33
34	34	#include "base/system_util.h"
35		#include "config/config.pb.h"
36	35	#include "config/config_handler.h"
37	36	#include "converter/conversion_request.h"
38	37	#include "converter/converter_mock.h"
39	38	#include "converter/segments.h"
40	39	#include "data_manager/testing/mock_data_manager.h"
41	40	#include "dictionary/pos_group.h"
	41	#include "protocol/config.pb.h"
42	42	#include "rewriter/rewriter_interface.h"
43	43	#include "testing/base/public/gunit.h"
44	44

+1

-1

src/rewriter/rewriter_test.gyp less more

138	138	'../base/base.gyp:base',
139	139	'../composer/composer.gyp:composer',
140	140	'../config/config.gyp:config_handler',
141		'../config/config.gyp:config_protocol',
142	141	'../converter/converter_base.gyp:conversion_request',
143	142	'../converter/converter_base.gyp:segments',
144	143	'../data_manager/data_manager.gyp:user_pos_manager',

146	145	'../dictionary/dictionary.gyp:dictionary_mock',
147	146	'../dictionary/dictionary_base.gyp:pos_matcher',
148	147	'../protocol/protocol.gyp:commands_proto',
	148	'../protocol/protocol.gyp:config_proto',
149	149	'../testing/testing.gyp:gtest_main',
150	150	'../usage_stats/usage_stats_test.gyp:usage_stats_testing_util',
151	151	'rewriter.gyp:rewriter',

+1

-1

src/rewriter/single_kanji_rewriter.cc less more

36	36	#include "base/logging.h"
37	37	#include "base/singleton.h"
38	38	#include "base/util.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/conversion_request.h"
42	41	#include "converter/segments.h"
43	42	#include "dictionary/pos_matcher.h"
44	43	#include "protocol/commands.pb.h"
	44	#include "protocol/config.pb.h"
45	45	#include "rewriter/embedded_dictionary.h"
46	46	#include "rewriter/rewriter_interface.h"
47	47

+1

-1

src/rewriter/single_kanji_rewriter_test.cc less more

35	35	#include "base/system_util.h"
36	36	#include "base/util.h"
37	37	#include "config/config_handler.h"
38		#include "config/config.pb.h"
39	38	#include "converter/conversion_request.h"
40	39	#include "converter/segments.h"
41	40	#include "data_manager/testing/mock_data_manager.h"
42	41	#include "dictionary/pos_matcher.h"
43	42	#include "protocol/commands.pb.h"
	43	#include "protocol/config.pb.h"
44	44	#include "testing/base/public/gunit.h"
45	45
46	46	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/symbol_rewriter.cc less more

36	36	#include "base/logging.h"
37	37	#include "base/singleton.h"
38	38	#include "base/util.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/conversion_request.h"
42	41	#include "converter/converter_interface.h"
43	42	#include "converter/segments.h"
44	43	#include "data_manager/data_manager_interface.h"
45	44	#include "protocol/commands.pb.h"
	45	#include "protocol/config.pb.h"
46	46	#include "rewriter/embedded_dictionary.h"
47	47	#include "rewriter/rewriter_interface.h"
48	48

+1

-1

src/rewriter/symbol_rewriter_test.cc less more

34	34	#include "base/scoped_ptr.h"
35	35	#include "base/system_util.h"
36	36	#include "base/util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "converter/conversion_request.h"
40	39	#include "converter/segments.h"

42	41	#include "engine/engine_interface.h"
43	42	#include "engine/mock_data_engine_factory.h"
44	43	#include "protocol/commands.pb.h"
	44	#include "protocol/config.pb.h"
45	45	#include "testing/base/public/gunit.h"
46	46
47	47	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/transliteration_rewriter_test.cc less more

38	38	#include "base/util.h"
39	39	#include "composer/composer.h"
40	40	#include "composer/table.h"
41		#include "config/config.pb.h"
42	41	#include "config/config_handler.h"
43	42	#include "converter/conversion_request.h"
44	43	#include "converter/segments.h"

49	48	#include "data_manager/user_pos_manager.h"
50	49	#include "dictionary/pos_matcher.h"
51	50	#include "protocol/commands.pb.h"
	51	#include "protocol/config.pb.h"
52	52	#include "testing/base/public/gunit.h"
53	53	#include "transliteration/transliteration.h"
54	54	#include "usage_stats/usage_stats.h"

+1

-1

src/rewriter/unicode_rewriter_test.cc less more

36	36	#include "base/system_util.h"
37	37	#include "base/util.h"
38	38	#include "composer/composer.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/conversion_request.h"
42	41	#include "converter/segments.h"
43	42	#include "engine/engine_interface.h"
44	43	#include "engine/mock_data_engine_factory.h"
45	44	#include "protocol/commands.pb.h"
	45	#include "protocol/config.pb.h"
46	46	#include "testing/base/public/gunit.h"
47	47
48	48	DECLARE_string(test_tmpdir);

+2

-2

src/rewriter/usage_rewriter.cc less more

32	32
33	33	#include "base/logging.h"
34	34	#include "base/util.h"
35		#include "config/config.pb.h"
36	35	#include "config/config_handler.h"
37	36	#include "converter/conversion_request.h"
38	37	#include "converter/segments.h"
39	38	#include "data_manager/data_manager_interface.h"
	39	#include "dictionary/dictionary_interface.h"
40	40	#include "dictionary/pos_matcher.h"
41		#include "dictionary/dictionary_interface.h"
	41	#include "protocol/config.pb.h"
42	42
43	43	using mozc::dictionary::DictionaryInterface;
44	44	using mozc::dictionary::POSMatcher;

+1

-1

src/rewriter/usage_rewriter_test.cc less more

31	31	#include <string>
32	32
33	33	#include "base/system_util.h"
34		#include "config/config.pb.h"
35	34	#include "config/config_handler.h"
36	35	#include "converter/conversion_request.h"
37	36	#include "converter/segments.h"

41	40	#include "dictionary/suppression_dictionary.h"
42	41	#include "dictionary/user_dictionary.h"
43	42	#include "dictionary/user_dictionary_storage.h"
	43	#include "protocol/config.pb.h"
44	44	#include "testing/base/public/gunit.h"
45	45
46	46	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/user_boundary_history_rewriter.cc less more

36	36	#include "base/file_util.h"
37	37	#include "base/logging.h"
38	38	#include "base/util.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/conversion_request.h"
42	41	#include "converter/converter_interface.h"
43	42	#include "converter/segments.h"
	43	#include "protocol/config.pb.h"
44	44	#include "rewriter/rewriter_interface.h"
45	45	#include "rewriter/user_boundary_history_rewriter.h"
46	46	#include "storage/lru_storage.h"

+1

-1

src/rewriter/user_boundary_history_rewriter_test.cc less more

34	34
35	35	#include "base/file_util.h"
36	36	#include "base/system_util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "converter/conversion_request.h"
40	39	#include "converter/converter_mock.h"
41	40	#include "converter/segments.h"
	41	#include "protocol/config.pb.h"
42	42	#include "testing/base/public/googletest.h"
43	43	#include "testing/base/public/gunit.h"
44	44

+1

-1

src/rewriter/user_segment_history_rewriter.cc less more

42	42	#include "base/string_piece.h"
43	43	#include "base/util.h"
44	44	#include "config/character_form_manager.h"
45		#include "config/config.pb.h"
46	45	#include "config/config_handler.h"
47	46	#include "converter/conversion_request.h"
48	47	#include "converter/segments.h"
49	48	#include "dictionary/pos_group.h"
50	49	#include "dictionary/pos_matcher.h"
	50	#include "protocol/config.pb.h"
51	51	#include "rewriter/rewriter_interface.h"
52	52	#include "rewriter/variants_rewriter.h"
53	53	#include "storage/lru_storage.h"

+1

-1

src/rewriter/user_segment_history_rewriter_test.cc less more

37	37	#include "base/system_util.h"
38	38	#include "base/util.h"
39	39	#include "config/character_form_manager.h"
40		#include "config/config.pb.h"
41	40	#include "config/config_handler.h"
42	41	#include "converter/conversion_request.h"
43	42	#include "converter/segments.h"
44	43	#include "data_manager/testing/mock_data_manager.h"
45	44	#include "dictionary/pos_group.h"
46	45	#include "dictionary/pos_matcher.h"
	46	#include "protocol/config.pb.h"
47	47	#include "rewriter/number_rewriter.h"
48	48	#include "rewriter/variants_rewriter.h"
49	49	#include "testing/base/public/googletest.h"

+1

-1

src/rewriter/variants_rewriter_test.cc less more

35	35	#include "base/system_util.h"
36	36	#include "base/util.h"
37	37	#include "config/character_form_manager.h"
38		#include "config/config.pb.h"
39	38	#include "config/config_handler.h"
40	39	#include "converter/conversion_request.h"
41	40	#include "converter/segments.h"
42	41	#include "data_manager/user_pos_manager.h"
43	42	#include "dictionary/pos_matcher.h"
	43	#include "protocol/config.pb.h"
44	44	#include "testing/base/public/gunit.h"
45	45
46	46	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/version_rewriter_test.cc less more

33	33
34	34	#include "base/system_util.h"
35	35	#include "base/util.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/conversion_request.h"
39	38	#include "converter/segments.h"
40	39	#include "protocol/commands.pb.h"
	40	#include "protocol/config.pb.h"
41	41	#include "testing/base/public/gunit.h"
42	42
43	43	DECLARE_string(test_tmpdir);

+1

-1

src/rewriter/zipcode_rewriter.cc less more

31	31	#include <string>
32	32
33	33	#include "base/logging.h"
34		#include "config/config.pb.h"
35	34	#include "config/config_handler.h"
36	35	#include "converter/conversion_request.h"
37	36	#include "converter/segments.h"
38	37	#include "dictionary/pos_matcher.h"
	38	#include "protocol/config.pb.h"
39	39
40	40	using mozc::dictionary::POSMatcher;
41	41

+1

-1

src/rewriter/zipcode_rewriter_test.cc less more

32	32
33	33	#include "base/logging.h"
34	34	#include "base/system_util.h"
35		#include "config/config.pb.h"
36	35	#include "config/config_handler.h"
37	36	#include "converter/conversion_request.h"
38	37	#include "converter/segments.h"

42	41	#endif // MOZC_USE_PACKED_DICTIONARY
43	42	#include "data_manager/user_pos_manager.h"
44	43	#include "dictionary/pos_matcher.h"
	44	#include "protocol/config.pb.h"
45	45	#include "testing/base/public/gunit.h"
46	46
47	47	DECLARE_string(test_tmpdir);

+1

-1

src/session/ime_switch_util.cc less more

35	35
36	36	#include "base/port.h"
37	37	#include "base/singleton.h"
38		#include "config/config.pb.h"
39	38	#include "config/config_handler.h"
	39	#include "protocol/config.pb.h"
40	40	#include "session/key_info_util.h"
41	41
42	42	namespace mozc {

+1

-1

src/session/ime_switch_util_test.cc less more

32	32
33	33	#include "base/system_util.h"
34	34	#include "composer/key_parser.h"
35		#include "config/config.pb.h"
36	35	#include "config/config_handler.h"
37	36	#include "protocol/commands.pb.h"
	37	#include "protocol/config.pb.h"
38	38	#include "session/internal/keymap.h"
39	39	#include "testing/base/public/googletest.h"
40	40	#include "testing/base/public/gunit.h"

+1

-1

src/session/internal/key_event_transformer.cc less more

35	35	#include "base/singleton.h"
36	36	#include "base/util.h"
37	37	#include "composer/key_event_util.h"
38		#include "config/config.pb.h"
39	38	#include "config/config_handler.h"
40	39	#include "protocol/commands.pb.h"
	40	#include "protocol/config.pb.h"
41	41
42	42	namespace mozc {
43	43	namespace session {

+1

-1

src/session/internal/key_event_transformer.h less more

37	37
38	38	#include "base/port.h"
39	39	#include "base/singleton.h"
40		#include "config/config.pb.h"
41	40	#include "protocol/commands.pb.h"
	41	#include "protocol/config.pb.h"
42	42
43	43	namespace mozc {
44	44	namespace session {

+1

-1

src/session/internal/key_event_transformer_test.cc less more

30	30
31	31	#include "base/port.h"
32	32	#include "base/singleton.h"
33		#include "config/config.pb.h"
34	33	#include "protocol/commands.pb.h"
	34	#include "protocol/config.pb.h"
35	35
36	36	#include "testing/base/public/gunit.h"
37	37

+1

-1

src/session/internal/keymap.cc less more

43	43	#include "base/util.h"
44	44	#include "composer/key_event_util.h"
45	45	#include "composer/key_parser.h"
46		#include "config/config.pb.h"
47	46	#include "config/config_handler.h"
48	47	#include "protocol/commands.pb.h"
	48	#include "protocol/config.pb.h"
49	49	#include "session/internal/keymap-inl.h"
50	50
51	51	namespace mozc {

+1

-1

src/session/internal/keymap.h less more

36	36	#include <set>
37	37	#include <string>
38	38	#include "composer/key_event_util.h"
39		#include "config/config.pb.h"
	39	#include "protocol/config.pb.h"
40	40	#include "session/internal/keymap_interface.h"
41	41
42	42	namespace mozc {

+1

-1

src/session/internal/keymap_factory.cc less more

32	32
33	33	#include "base/port.h"
34	34	#include "base/freelist.h"
35		#include "config/config.pb.h"
	35	#include "protocol/config.pb.h"
36	36	#include "session/internal/keymap.h"
37	37
38	38	namespace mozc {

+1

-1

src/session/internal/keymap_factory.h less more

32	32	#include <map>
33	33
34	34	#include "base/freelist.h"
35		#include "config/config.pb.h"
	35	#include "protocol/config.pb.h"
36	36
37	37	namespace mozc {
38	38	namespace keymap {

+1

-1

src/session/internal/keymap_factory_test.cc less more

31	31	#include <map>
32	32
33	33	#include "composer/key_parser.h"
34		#include "config/config.pb.h"
35	34	#include "config/config_handler.h"
36	35	#include "protocol/commands.pb.h"
	36	#include "protocol/config.pb.h"
37	37	#include "session/internal/keymap.h"
38	38	#include "testing/base/public/googletest.h"
39	39	#include "testing/base/public/gunit.h"

+2

-2

src/session/internal/keymap_test.cc less more

34	34	#include "base/scoped_ptr.h"
35	35	#include "base/system_util.h"
36	36	#include "composer/key_parser.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "protocol/commands.pb.h"
	39	#include "protocol/config.pb.h"
	40	#include "session/internal/keymap-inl.h"
40	41	#include "session/internal/keymap.h"
41		#include "session/internal/keymap-inl.h"
42	42	#include "session/internal/keymap_factory.h"
43	43	#include "testing/base/public/gunit.h"
44	44

+1

-1

src/session/key_info_util.cc less more

38	38	#include "base/scoped_ptr.h"
39	39	#include "base/util.h"
40	40	#include "composer/key_parser.h"
41		#include "config/config.pb.h"
42	41	#include "config/config_handler.h"
43	42	#include "protocol/commands.pb.h"
	43	#include "protocol/config.pb.h"
44	44	#include "session/internal/keymap.h"
45	45
46	46	namespace mozc {

+1

-1

src/session/key_info_util_test.cc less more

29	29	#include "session/key_info_util.h"
30	30
31	31	#include "composer/key_parser.h"
32		#include "config/config.pb.h"
33	32	#include "config/config_handler.h"
34	33	#include "protocol/commands.pb.h"
	34	#include "protocol/config.pb.h"
35	35	#include "testing/base/public/googletest.h"
36	36	#include "testing/base/public/gunit.h"
37	37

+1

-1

src/session/session.cc less more

43	43	#include "composer/composer.h"
44	44	#include "composer/key_event_util.h"
45	45	#include "composer/table.h"
46		#include "config/config.pb.h"
47	46	#include "config/config_handler.h"
48	47	#include "engine/engine_interface.h"
49	48	#include "engine/user_data_manager_interface.h"
50	49	#include "protocol/commands.pb.h"
	50	#include "protocol/config.pb.h"
51	51	#include "session/internal/ime_context.h"
52	52	#include "session/internal/key_event_transformer.h"
53	53	#include "session/internal/keymap-inl.h"

+4

-4

src/session/session.gyp less more

43	43	'../base/base.gyp:base',
44	44	'../composer/composer.gyp:key_parser',
45	45	'../config/config.gyp:config_handler',
46		'../config/config.gyp:config_protocol',
47	46	'../converter/converter_base.gyp:converter_util',
48	47	'../protocol/protocol.gyp:commands_proto',
	48	'../protocol/protocol.gyp:config_proto',
49	49	'../transliteration/transliteration.gyp:transliteration',
50	50	'../usage_stats/usage_stats_base.gyp:usage_stats',
51	51	'session_base.gyp:keymap',

68	68	'../base/base.gyp:base',
69	69	'../composer/composer.gyp:composer',
70	70	'../config/config.gyp:config_handler',
71		'../config/config.gyp:config_protocol',
72	71	'../protocol/protocol.gyp:commands_proto',
	72	'../protocol/protocol.gyp:config_proto',
73	73	],
74	74	},
75	75	{

84	84	'../client/client.gyp:client',
85	85	'../composer/composer.gyp:composer',
86	86	'../config/config.gyp:config_handler',
87		'../config/config.gyp:config_protocol',
88	87	'../dictionary/dictionary_base.gyp:user_dictionary',
89	88	'../engine/engine.gyp:engine_factory',
90	89	'../protocol/protocol.gyp:commands_proto',
	90	'../protocol/protocol.gyp:config_proto',
91	91	'../protocol/protocol.gyp:user_dictionary_storage_proto',
92	92	'../usage_stats/usage_stats_base.gyp:usage_stats',
93	93	'session_base.gyp:generic_storage_manager',

143	143	'random_keyevents_generator.cc',
144	144	],
145	145	'dependencies': [
146		'../config/config.gyp:config_protocol',
147	146	'../protocol/protocol.gyp:commands_proto',
	147	'../protocol/protocol.gyp:config_proto',
148	148	'gen_session_stress_test_data#host',
149	149	'session',
150	150	],

+5

-5

src/session/session_base.gyp less more

42	42	'request_test_util.cc',
43	43	],
44	44	'dependencies': [
45		'../config/config.gyp:config_protocol',
46	45	'../protocol/protocol.gyp:commands_proto',
	46	'../protocol/protocol.gyp:config_proto',
47	47	],
48	48	},
49	49	{

57	57	'../composer/composer.gyp:key_event_util',
58	58	'../composer/composer.gyp:key_parser',
59	59	'../config/config.gyp:config_handler',
60		'../config/config.gyp:config_protocol',
61	60	'../protocol/protocol.gyp:commands_proto',
	61	'../protocol/protocol.gyp:config_proto',
62	62	],
63	63	},
64	64	{

69	69	],
70	70	'dependencies': [
71	71	'../base/base.gyp:base',
72		'../config/config.gyp:config_protocol',
73	72	'../protocol/protocol.gyp:commands_proto',
	73	'../protocol/protocol.gyp:config_proto',
74	74	'keymap',
75	75	],
76	76	},

83	83	'dependencies': [
84	84	'../base/base.gyp:base',
85	85	'../config/config.gyp:config_handler',
86		'../config/config.gyp:config_protocol',
87	86	'../protocol/protocol.gyp:commands_proto',
	87	'../protocol/protocol.gyp:config_proto',
88	88	'key_info_util',
89	89	],
90	90	},

100	100	'../composer/composer.gyp:key_event_util',
101	101	'../composer/composer.gyp:key_parser',
102	102	'../config/config.gyp:config_handler',
103		'../config/config.gyp:config_protocol',
	103	'../protocol/protocol.gyp:config_proto',
104	104	'keymap',
105	105	],
106	106	},

+1

-1

src/session/session_converter.cc less more

39	39	#include "base/text_normalizer.h"
40	40	#include "base/util.h"
41	41	#include "composer/composer.h"
42		#include "config/config.pb.h"
43	42	#include "config/config_handler.h"
44	43	#include "converter/converter_interface.h"
45	44	#include "converter/converter_util.h"
46	45	#include "converter/segments.h"
47	46	#include "protocol/commands.pb.h"
	47	#include "protocol/config.pb.h"
48	48	#include "session/internal/candidate_list.h"
49	49	#include "session/internal/session_output.h"
50	50	#include "session/session_usage_stats_util.h"

+1

-1

src/session/session_converter_stress_test.cc less more

35	35	#include "base/util.h"
36	36	#include "composer/composer.h"
37	37	#include "composer/table.h"
38		#include "config/config.pb.h"
39	38	#include "config/config_handler.h"
40	39	#include "engine/engine_interface.h"
41	40	#include "engine/mock_data_engine_factory.h"
42	41	#include "protocol/commands.pb.h"
	42	#include "protocol/config.pb.h"
43	43	#include "testing/base/public/googletest.h"
44	44	#include "testing/base/public/gunit.h"
45	45

+1

-1

src/session/session_converter_test.cc less more

44	44	#include "base/util.h"
45	45	#include "composer/composer.h"
46	46	#include "composer/table.h"
47		#include "config/config.pb.h"
48	47	#include "config/config_handler.h"
49	48	#include "converter/converter_mock.h"
50	49	#include "converter/segments.h"
51	50	#include "protocol/candidates.pb.h"
52	51	#include "protocol/commands.pb.h"
	52	#include "protocol/config.pb.h"
53	53	#include "session/internal/candidate_list.h"
54	54	#include "session/internal/keymap.h"
55	55	#include "session/request_test_util.h"

+1

-1

src/session/session_handler.cc less more

43	43	#include "base/stopwatch.h"
44	44	#include "base/util.h"
45	45	#include "composer/table.h"
46		#include "config/config.pb.h"
47	46	#include "config/config_handler.h"
48	47	#include "dictionary/user_dictionary_session_handler.h"
49	48	#include "engine/engine_interface.h"
50	49	#include "engine/user_data_manager_interface.h"
51	50	#include "protocol/commands.pb.h"
	51	#include "protocol/config.pb.h"
52	52	#include "protocol/user_dictionary_storage.pb.h"
53	53	#include "session/generic_storage_manager.h"
54	54	#include "session/session.h"

+1

-1

src/session/session_handler_scenario_test.cc less more

36	36	#include "base/string_piece.h"
37	37	#include "base/util.h"
38	38	#include "composer/key_parser.h"
39		#include "config/config.pb.h"
40	39	#include "config/config_handler.h"
41	40	#include "converter/converter_interface.h"
42	41	#include "engine/mock_data_engine_factory.h"
43	42	#include "engine/user_data_manager_interface.h"
44	43	#include "protocol/commands.pb.h"
	44	#include "protocol/config.pb.h"
45	45	#include "session/request_test_util.h"
46	46	#include "session/session_handler_test_util.h"
47	47	#include "testing/base/public/gunit.h"

+1

-1

src/session/session_handler_test.cc less more

33	33	#include "base/clock_mock.h"
34	34	#include "base/port.h"
35	35	#include "base/util.h"
36		#include "config/config.pb.h"
37	36	#include "config/config_handler.h"
38	37	#include "converter/converter_mock.h"
39	38	#include "engine/mock_converter_engine.h"
40	39	#include "engine/mock_data_engine_factory.h"
41	40	#include "engine/user_data_manager_mock.h"
42	41	#include "protocol/commands.pb.h"
	42	#include "protocol/config.pb.h"
43	43	#include "session/generic_storage_manager.h"
44	44	#include "session/session_handler.h"
45	45	#include "session/session_handler_test_util.h"

+1

-1

src/session/session_handler_test_util.cc less more

31	31	#include "base/config_file_stream.h"
32	32	#include "base/file_util.h"
33	33	#include "base/system_util.h"
34		#include "config/config.pb.h"
35	34	#include "config/config_handler.h"
36	35	#include "converter/converter_interface.h"
37	36	#include "engine/engine_interface.h"
38	37	#include "prediction/user_history_predictor.h"
39	38	#include "protocol/commands.pb.h"
	39	#include "protocol/config.pb.h"
40	40	#include "session/session_handler.h"
41	41	#include "session/session_handler_interface.h"
42	42	#include "session/session_usage_observer.h"

+1

-1

src/session/session_handler_test_util.h less more

34	34	#include <string>
35	35	#include "base/port.h"
36	36	#include "base/scoped_ptr.h"
37		#include "config/config.pb.h"
38	37	#include "protocol/commands.pb.h"
	38	#include "protocol/config.pb.h"
39	39	#include "testing/base/public/gunit.h"
40	40	#include "usage_stats/usage_stats_testing_util.h"
41	41

+1

-1

src/session/session_regression_test.cc less more

37	37	#include "base/system_util.h"
38	38	#include "composer/key_parser.h"
39	39	#include "composer/table.h"
40		#include "config/config.pb.h"
41	40	#include "config/config_handler.h"
42	41	#include "converter/segments.h"
43	42	#include "engine/engine_factory.h"
44	43	#include "protocol/candidates.pb.h"
45	44	#include "protocol/commands.pb.h"
	45	#include "protocol/config.pb.h"
46	46	#include "rewriter/rewriter_interface.h"
47	47	#include "session/internal/ime_context.h"
48	48	#include "session/internal/keymap.h"

+1

-1

src/session/session_test.cc less more

37	37	#include "composer/composer.h"
38	38	#include "composer/key_parser.h"
39	39	#include "composer/table.h"
40		#include "config/config.pb.h"
41	40	#include "config/config_handler.h"
42	41	#include "converter/conversion_request.h"
43	42	#include "converter/converter_mock.h"

48	47	#include "engine/mock_data_engine_factory.h"
49	48	#include "protocol/candidates.pb.h"
50	49	#include "protocol/commands.pb.h"
	50	#include "protocol/config.pb.h"
51	51	#include "rewriter/transliteration_rewriter.h"
52	52	#include "session/internal/ime_context.h"
53	53	#include "session/internal/keymap.h"

+3

-3

src/session/session_test.gyp less more

41	41	'dependencies': [
42	42	'../base/base.gyp:base',
43	43	'../config/config.gyp:config_handler',
44		'../config/config.gyp:config_protocol',
45	44	'../engine/engine.gyp:engine_factory',
46	45	'../engine/engine.gyp:mock_data_engine_factory',
47	46	'../protocol/protocol.gyp:commands_proto',
	47	'../protocol/protocol.gyp:config_proto',
48	48	'../testing/testing.gyp:testing',
49	49	'../usage_stats/usage_stats_test.gyp:usage_stats_testing_util',
50	50	'session.gyp:session',

213	213	],
214	214	'dependencies': [
215	215	'../base/base.gyp:base',
216		'../config/config.gyp:config_protocol',
217	216	'../converter/converter_base.gyp:converter_mock',
218	217	'../engine/engine.gyp:mock_converter_engine',
	218	'../protocol/protocol.gyp:commands_proto',
	219	'../protocol/protocol.gyp:config_proto',
219	220	'../testing/testing.gyp:gtest_main',
220	221	'../testing/testing.gyp:testing_util',
221	222	'session.gyp:session',
222		'../protocol/protocol.gyp:commands_proto',
223	223	],
224	224	'variables': {
225	225	'test_size': 'small',

+2

-2

src/unix/emacs/emacs.gyp less more

40	40	'dependencies': [
41	41	'../../base/base.gyp:base',
42	42	'../../config/config.gyp:config_handler',
43		'../../config/config.gyp:config_protocol',
44	43	'../../ipc/ipc.gyp:ipc',
45	44	'../../protocol/protocol.gyp:commands_proto',
	45	'../../protocol/protocol.gyp:config_proto',
46	46	'mozc_emacs_helper_lib',
47	47	],
48	48	},

57	57	'../../base/base.gyp:base',
58	58	'../../client/client.gyp:client',
59	59	'../../composer/composer.gyp:key_parser',
60		'../../config/config.gyp:config_protocol',
61	60	'../../protocol/protocol.gyp:commands_proto',
	61	'../../protocol/protocol.gyp:config_proto',
62	62	'../../storage/storage.gyp:storage',
63	63	],
64	64	},

+1

-1

src/unix/ibus/key_event_handler.h less more

33	33	#include <set>
34	34
35	35	#include "base/port.h"
36		#include "config/config.pb.h"
37	36	#include "protocol/commands.pb.h"
	37	#include "protocol/config.pb.h"
38	38	#include "unix/ibus/key_translator.h"
39	39
40	40	namespace mozc {

+1

-1

src/unix/ibus/key_event_handler_test.cc less more

34	34	#include "base/port.h"
35	35	#include "base/util.h"
36	36	#include "composer/key_event_util.h"
37		#include "config/config.pb.h"
38	37	#include "protocol/commands.pb.h"
	38	#include "protocol/config.pb.h"
39	39	#include "testing/base/public/gunit.h"
40	40
41	41	using std::unique_ptr;

+1

-1

src/unix/ibus/mozc_engine.cc less more

45	45	#include "base/system_util.h"
46	46	#include "base/util.h"
47	47	#include "client/client.h"
48		#include "config/config.pb.h"
49	48	#include "protocol/commands.pb.h"
	49	#include "protocol/config.pb.h"
50	50	#include "session/ime_switch_util.h"
51	51	#include "unix/ibus/engine_registrar.h"
52	52	#include "unix/ibus/ibus_candidate_window_handler.h"

+1

-1

src/usage_stats/usage_stats.gyp less more

45	45	'../base/base.gyp:config_file_stream',
46	46	'../base/base.gyp:encryptor',
47	47	'../config/config.gyp:config_handler',
48		'../config/config.gyp:config_protocol',
49	48	'../config/config.gyp:stats_config_util',
50	49	'../net/net.gyp:http_client',
	50	'../protocol/protocol.gyp:config_proto',
51	51	'../session/session_base.gyp:keymap',
52	52	'../storage/storage.gyp:storage',
53	53	'usage_stats_base.gyp:gen_usage_stats_list#host',

+1

-1

src/usage_stats/usage_stats_test.gyp less more

72	72	],
73	73	'dependencies': [
74	74	'../config/config.gyp:config_handler',
75		'../config/config.gyp:config_protocol',
76	75	'../net/net.gyp:http_client_mock',
	76	'../protocol/protocol.gyp:config_proto',
77	77	'../testing/testing.gyp:gtest_main',
78	78	'usage_stats.gyp:usage_stats_uploader',
79	79	'usage_stats_base.gyp:usage_stats_protocol',

+1

-1

src/usage_stats/usage_stats_updater.cc less more

45	45	#include "base/system_util.h"
46	46	#include "base/util.h"
47	47	#include "base/win_util.h"
48		#include "config/config.pb.h"
49	48	#include "config/config_handler.h"
	49	#include "protocol/config.pb.h"
50	50	#include "session/internal/keymap.h"
51	51	#include "usage_stats/usage_stats.h"
52	52

+1

-1

src/usage_stats/usage_stats_updater_test.cc less more

34	34	#include "base/scoped_ptr.h"
35	35	#include "base/system_util.h"
36	36	#include "base/util.h"
37		#include "config/config.pb.h"
38	37	#include "config/config_handler.h"
39	38	#include "protocol/commands.pb.h"
	39	#include "protocol/config.pb.h"
40	40	#include "testing/base/public/gunit.h"
41	41	#include "usage_stats/usage_stats.h"
42	42	#include "usage_stats/usage_stats_testing_util.h"

+1

-1

src/usage_stats/usage_stats_uploader_test.cc less more

44	44	#include "base/util.h"
45	45	#include "base/version.h"
46	46	#include "base/win_util.h"
47		#include "config/config.pb.h"
48	47	#include "config/config_handler.h"
49	48	#include "net/http_client.h"
	49	#include "protocol/config.pb.h"
50	50	#include "storage/registry.h"
51	51	#include "storage/storage_interface.h"
52	52	#include "testing/base/public/gunit.h"

+1

-1

src/win32/base/config_snapshot.cc less more

30	30
31	31	#include "base/win_util.h"
32	32	#include "client/client_interface.h"
33		#include "config/config.pb.h"
34	33	#include "config/config_handler.h"
	34	#include "protocol/config.pb.h"
35	35
36	36	namespace mozc {
37	37	namespace win32 {

+1

-1

src/win32/base/win32_base.gyp less more

120	120	'dependencies': [
121	121	'../../base/base.gyp:base',
122	122	'../../config/config.gyp:config_handler',
123		'../../config/config.gyp:config_protocol',
124	123	'../../protocol/protocol.gyp:commands_proto',
	124	'../../protocol/protocol.gyp:config_proto',
125	125	'../../session/session_base.gyp:key_info_util',
126	126	'../../session/session_base.gyp:output_util',
127	127	],

+1

-1

src/win32/broker/ime_switcher.cc less more

38	38	#include "base/system_util.h"
39	39	#include "base/win_util.h"
40	40	#include "client/client.h"
41		#include "config/config.pb.h"
42	41	#include "config/config_handler.h"
	42	#include "protocol/config.pb.h"
43	43	#include "win32/base/imm_registrar.h"
44	44	#include "win32/base/imm_util.h"
45	45	#include "win32/base/migration_util.h"

+1

-1

src/win32/broker/mozc_broker.gypi less more

45	45	'dependencies': [
46	46	'../../base/base.gyp:crash_report_handler',
47	47	'../../client/client.gyp:client',
48		'../../config/config.gyp:config_protocol',
49	48	'../../config/config.gyp:stats_config_util',
	49	'../../protocol/protocol.gyp:config_proto',
50	50	'../../renderer/renderer.gyp:renderer_client',
51	51	'../base/win32_base.gyp:ime_base',
52	52	'../base/win32_base.gyp:win32_file_verifier',

+1

-1

src/win32/ime/ime.gyp less more

116	116	'../../base/base.gyp:base',
117	117	'../../client/client.gyp:client',
118	118	'../../config/config.gyp:config_handler',
119		'../../config/config.gyp:config_protocol',
120	119	'../../ipc/ipc.gyp:ipc',
121	120	'../../protocol/protocol.gyp:commands_proto',
	121	'../../protocol/protocol.gyp:config_proto',
122	122	'../../protocol/protocol.gyp:renderer_proto',
123	123	'../../renderer/renderer.gyp:win32_font_util',
124	124	'../../renderer/renderer.gyp:win32_renderer_client',