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

Unified Diff: chromeos/BUILD.gn

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc ('k') | chromeos/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/BUILD.gn
diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn
index e6969e2f2d583e791701abcb4c9163dfccfec58f..33c47b15e77daf7962d7bceaccb58fdeb08aecba 100644
--- a/chromeos/BUILD.gn
+++ b/chromeos/BUILD.gn
@@ -39,6 +39,19 @@
]
sources = gypi_values.chromeos_sources
defines = [ "CHROMEOS_IMPLEMENTATION" ]
+ if (use_x11) {
+ configs += [ "//build/config/linux:x11" ]
+ deps += [ "//ui/gfx/x" ]
+ sources -= [
+ "ime/ime_keyboard_ozone.cc",
+ "ime/ime_keyboard_ozone.h",
+ ]
+ } else {
+ sources -= [
+ "ime/ime_keyboard_x11.cc",
+ "ime/ime_keyboard_x11.h",
+ ]
+ }
}
static_library("test_support") {
@@ -121,6 +134,8 @@
"dbus/fake_shill_manager_client.h",
"dbus/fake_update_engine_client.cc",
"dbus/fake_update_engine_client.h",
+ "ime/fake_input_method_delegate.cc",
+ "ime/fake_input_method_delegate.h",
]
}
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/keyboard_handler.cc ('k') | chromeos/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698