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

Unified Diff: ui/base/ime/BUILD.gn

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/BUILD.gn ('k') | ui/base/ime/chromeos/composition_text.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/BUILD.gn
diff --git a/ui/base/ime/BUILD.gn b/ui/base/ime/BUILD.gn
index e6974021af55bde3df9be9c81e5dde852fb8aaab..99e4aaeed476bb155626b5944be43686db0921fa 100644
--- a/ui/base/ime/BUILD.gn
+++ b/ui/base/ime/BUILD.gn
@@ -14,8 +14,8 @@ component("ime") {
"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",
@@ -166,10 +166,9 @@ component("ime") {
}
if (is_win) {
- cflags = [
- "/wd4324", # Structure was padded due to __declspec(align()), which is
- # uninteresting.
- ]
+ cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), which is
+ # uninteresting.
+
libs = [ "imm32.lib" ]
}
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/base/ime/chromeos/composition_text.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698