summaryrefslogtreecommitdiffstats
path: root/chromeos/chromeos.gyp
diff options
context:
space:
mode:
authorfengyuan <fengyuan@chromium.org>2014-10-30 02:19:19 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-30 09:19:39 +0000
commit8be55caf3d38bba7645de143f7e6b8b655fdd36c (patch)
treec6dce3f7f7c49991d7f32aeda45332a47c8dc950 /chromeos/chromeos.gyp
parent4373698a495a4949e673f885bfc9ed2da0afb1d3 (diff)
downloadchromium_src-8be55caf3d38bba7645de143f7e6b8b655fdd36c.zip
chromium_src-8be55caf3d38bba7645de143f7e6b8b655fdd36c.tar.gz
chromium_src-8be55caf3d38bba7645de143f7e6b8b655fdd36c.tar.bz2
Adds ozone support for ime keyboard.
BUG=342336 Review URL: https://codereview.chromium.org/683773002 Cr-Commit-Position: refs/heads/master@{#302057}
Diffstat (limited to 'chromeos/chromeos.gyp')
-rw-r--r--chromeos/chromeos.gyp4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 0fb9748..795c23e 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -230,10 +230,10 @@
'ime/extension_ime_util.h',
'ime/fake_ime_keyboard.cc',
'ime/fake_ime_keyboard.h',
+ 'ime/ime_keyboard.cc',
'ime/ime_keyboard.h',
- 'ime/ime_keyboard_ozone.cc',
- 'ime/ime_keyboard_x11.h',
'ime/ime_keyboard_x11.cc',
+ 'ime/ime_keyboard_x11.h',
'ime/input_method_delegate.h',
'ime/input_method_descriptor.cc',
'ime/input_method_descriptor.h',