chrome/browser/chromeos/input_method/input_method.gyp - Issue 8505051: Support mozc suggest window on ChromeOS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/input_method/input_method.gyp

Issue 8505051: Support mozc suggest window on ChromeOS. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Fixed wrong condition and some typo Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/input_method/candidate_window.cc ('K') | « chrome/browser/chromeos/input_method/candidate_window.cc ('k') | chrome/browser/chromeos/input_method/mozc_commands.diff » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/input_method.gyp

diff --git a/chrome/browser/chromeos/input_method/input_method.gyp b/chrome/browser/chromeos/input_method/input_method.gyp

index c9beba8eca3fd688f4434502045b28f58674f70c..ea133f7e6da1b51f4264306fa427fb61ded58271 100644

--- a/chrome/browser/chromeos/input_method/input_method.gyp

+++ b/chrome/browser/chromeos/input_method/input_method.gyp

@@ -62,12 +62,38 @@

'../../../../third_party/mozc/session/commands.proto',

'outputs': [

- '<(input_method_out_dir)/mozc/session/commands.proto',

+ '<(input_method_out_dir)/mozc/session/.litified.commands.proto',

'action': [

'python',

'litify_proto_file.py',

'../../../../third_party/mozc/session/commands.proto',

+ # For patching 'mozc_commands_patch', we set output file as temporary.

+ '<(input_method_out_dir)/mozc/session/.litified.commands.proto',

+ ],

+ },

+ ]

+ },

+ {

+ 'target_name': 'mozc_commands_patch',

+ 'type': 'none',

+ 'actions': [

+ {

+ # TODO(nona): removes following patch after mozc package update.

+ 'action_name': 'mozc_commands_local_patch',

+ 'inputs': [

+ 'mozc_commands.diff',

+ '<(input_method_out_dir)/mozc/session/.litified.commands.proto',

+ ],

+ 'outputs': [

+ '<(input_method_out_dir)/mozc/session/commands.proto',

+ ],

+ 'action': [

+ 'patch',

+ '<(input_method_out_dir)/mozc/session/.litified.commands.proto',

+ '-i',

+ 'mozc_commands.diff',

+ '-o',

'<(input_method_out_dir)/mozc/session/commands.proto',

@@ -105,6 +131,7 @@

'dependencies': [

'litify_mozc_proto_files',

+ 'mozc_commands_patch',

'../../../../third_party/protobuf/protobuf.gyp:protobuf_lite',

'../../../../third_party/protobuf/protobuf.gyp:protoc#host',