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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/ime/ui_base_ime.gyp

Issue 1149223004: Avoid basename conflict in text_composition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 7 months 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.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/ui_base_ime.gyp
diff --git a/ui/base/ime/ui_base_ime.gyp b/ui/base/ime/ui_base_ime.gyp
index e58be98b56b6932fd37f55450e37e53c8b990fd4..65134f76fe64af32c6f5fc0c9a624b2aba6b675c 100644
--- a/ui/base/ime/ui_base_ime.gyp
+++ b/ui/base/ime/ui_base_ime.gyp
@@ -35,8 +35,8 @@
'chromeos/character_composer.h',
'chromeos/component_extension_ime_manager.cc',
'chromeos/component_extension_ime_manager.h',
- 'chromeos/composition_text.cc',
- 'chromeos/composition_text.h',
+ 'chromeos/composition_text_chromeos.cc',
+ 'chromeos/composition_text_chromeos.h',
'chromeos/extension_ime_util.cc',
'chromeos/extension_ime_util.h',
'chromeos/fake_ime_keyboard.cc',
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698