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

Issues Search
    My Issues | Starred     Open | Closed | All

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: addressed mukai@'s comments. 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
« ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.cc ('K') | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gypi » ('j') | ui/base/ui_base_tests.gypi » ('J')
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 9f187df8d8a9ca6d89586c2ac3862a06f0afd81c..dca50afd1aea254163d1fe9674051d15e777a2c0 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -201,6 +201,29 @@
'ime/chromeos/mock_ime_engine_handler.h',
'ime/chromeos/mock_ime_input_context_handler.cc',
'ime/chromeos/mock_ime_input_context_handler.h',
+ 'ime/chromeos/component_extension_ime_manager.cc',
Yuki 2014/11/20 09:23:03 Could you sort the files?
Shu Chen 2014/11/20 14:32:26 Done.
+ '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/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/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/input_method_chromeos.cc',
+ 'ime/input_method_chromeos.h',
'ime/composition_text.cc',
'ime/composition_text.h',
'ime/composition_text_util_pango.cc',
@@ -215,8 +238,6 @@
'ime/input_method_auralinux.h',
'ime/input_method_base.cc',
'ime/input_method_base.h',
- 'ime/input_method_chromeos.cc',
- 'ime/input_method_chromeos.h',
'ime/input_method_delegate.h',
'ime/input_method_factory.cc',
'ime/input_method_factory.h',
@@ -657,15 +678,43 @@
}],
['chromeos==0', {
'sources!': [
+ 'ime/chromeos/character_composer.cc',
Yuki 2014/11/20 09:23:03 filename_rules.gypi automatically excludes chromeo
Shu Chen 2014/11/20 14:32:26 Done.
+ 'ime/chromeos/character_composer.h',
+ 'ime/chromeos/ime_bridge.cc',
+ 'ime/chromeos/ime_bridge.h',
+ 'ime/chromeos/ime_keymap.cc',
+ 'ime/chromeos/ime_keymap.h',
+ 'ime/chromeos/mock_ime_candidate_window_handler.cc',
+ 'ime/chromeos/mock_ime_candidate_window_handler.h',
+ 'ime/chromeos/mock_ime_engine_handler.cc',
+ 'ime/chromeos/mock_ime_engine_handler.h',
+ 'ime/chromeos/mock_ime_input_context_handler.cc',
+ 'ime/chromeos/mock_ime_input_context_handler.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/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/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/input_method_chromeos.cc',
Yuki 2014/11/20 09:23:03 Actually the files with the suffix "_chromeos.{h,c
Shu Chen 2014/11/20 14:32:26 Done.
'ime/input_method_chromeos.h',
],
}],
- ['chromeos==1', {
- 'dependencies': [
- '../../chromeos/chromeos.gyp:chromeos',
- ],
- }],
['OS!="win"', {
'sources!': [
'ime/input_method_imm32.cc',
@@ -738,6 +787,14 @@
'test/ui_controls_win.cc',
],
}],
+ ['chromeos == 1', {
+ 'sources': [
+ 'ime/chromeos/fake_input_method_delegate.cc',
Yuki 2014/11/20 09:23:03 Since chromeos/* are automatically excluded, you c
Shu Chen 2014/11/20 14:32:27 Done.
+ 'ime/chromeos/fake_input_method_delegate.h',
+ 'ime/chromeos/mock_component_extension_ime_manager_delegate.cc',
+ 'ime/chromeos/mock_component_extension_ime_manager_delegate.h',
+ ],
+ }],
],
},
],
« ui/base/ime/chromeos/mock_component_extension_ime_manager_delegate.cc ('K') | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gypi » ('j') | ui/base/ui_base_tests.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698