Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(753)

Unified Diff: ui/base/ui_base.gyp

Issue 727143002: Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit. Created 6 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
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ui_base.gyp
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index 928cf2cd1587f12ea149df54bfd507b2c5af55d6..42ab747e0e5dd1a996fd9426745a67937c7e36ca 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -194,10 +194,35 @@
'ime/candidate_window.h',
'ime/chromeos/character_composer.cc',
'ime/chromeos/character_composer.h',
+ 'ime/chromeos/component_extension_ime_manager.cc',
+ 'ime/chromeos/component_extension_ime_manager.h',
+ 'ime/chromeos/composition_text.cc',
+ 'ime/chromeos/composition_text.h',
+ 'ime/chromeos/extension_ime_util.cc',
+ 'ime/chromeos/extension_ime_util.h',
+ 'ime/chromeos/fake_ime_keyboard.cc',
+ 'ime/chromeos/fake_ime_keyboard.h',
+ 'ime/chromeos/fake_input_method_delegate.cc',
+ 'ime/chromeos/fake_input_method_delegate.h',
'ime/chromeos/ime_bridge.cc',
'ime/chromeos/ime_bridge.h',
+ 'ime/chromeos/ime_keyboard.cc',
+ 'ime/chromeos/ime_keyboard.h',
+ 'ime/chromeos/ime_keyboard_ozone.cc',
+ 'ime/chromeos/ime_keyboard_ozone.h',
+ 'ime/chromeos/ime_keyboard_x11.cc',
+ 'ime/chromeos/ime_keyboard_x11.h',
'ime/chromeos/ime_keymap.cc',
'ime/chromeos/ime_keymap.h',
+ 'ime/chromeos/input_method_delegate.h',
+ 'ime/chromeos/input_method_descriptor.cc',
+ 'ime/chromeos/input_method_descriptor.h',
+ 'ime/chromeos/input_method_manager.cc',
+ 'ime/chromeos/input_method_manager.h',
+ 'ime/chromeos/input_method_whitelist.cc',
+ 'ime/chromeos/input_method_whitelist.h',
+ 'ime/chromeos/mock_component_extension_ime_manager_delegate.cc',
+ 'ime/chromeos/mock_component_extension_ime_manager_delegate.h',
'ime/chromeos/mock_ime_candidate_window_handler.cc',
'ime/chromeos/mock_ime_candidate_window_handler.h',
'ime/chromeos/mock_ime_engine_handler.cc',
@@ -658,12 +683,6 @@
'ime/input_method_minimal.h',
],
}],
- ['chromeos==0', {
- 'sources!': [
- 'ime/input_method_chromeos.cc',
- 'ime/input_method_chromeos.h',
- ],
- }],
['chromeos==1', {
'dependencies': [
'../../chromeos/chromeos.gyp:chromeos',
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698