Skip to content

GitLab

T
tangled
Commit b4610c27 authored by sky's avatar sky Committed by Commit bot
Browse files
Options

Folds ui/base/ime/BUILD.gn into ui/base 

Which is what we do on the gyp side too. Going this route rather than a different BUILD.gn as there aren't a lot of files and we don't have separate components on the gyp side.

BUG=408648
TEST=none
R=brettw@chromium.org

Review URL: https://codereview.chromium.org/552053005

Cr-Commit-Position: refs/heads/master@{#294415}
parent b1f28c8f
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 129 deletions
ui/base/BUILD.gn
View file @ b4610c27
......@@ -9,6 +9,8 @@ if (is_android) {
import("//build/config/android/rules.gni")
}
build_ime = !is_ios
component("base") {
output_name = "ui_base"
sources = [
......@@ -301,17 +303,116 @@ component("base") {
"//ui/gfx",
]
if (build_ime) {
if (!is_android) {
deps += [
"//ui/events",
]
}
sources += [
"ime/candidate_window.cc",
"ime/candidate_window.h",
"ime/chromeos/character_composer.cc",
"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/composition_text.cc",
"ime/composition_text.h",
"ime/composition_text_util_pango.cc",
"ime/composition_text_util_pango.h",
"ime/composition_underline.h",
"ime/dummy_input_method_delegate.cc",
"ime/dummy_input_method_delegate.h",
"ime/infolist_entry.cc",
"ime/infolist_entry.h",
"ime/input_method.h",
"ime/input_method_auralinux.cc",
"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",
"ime/input_method_initializer.cc",
"ime/input_method_initializer.h",
"ime/input_method_mac.h",
"ime/input_method_mac.mm",
"ime/input_method_minimal.cc",
"ime/input_method_minimal.h",
"ime/input_method_observer.h",
"ime/input_method_win.cc",
"ime/input_method_win.h",
"ime/linux/fake_input_method_context.cc",
"ime/linux/fake_input_method_context.h",
"ime/linux/fake_input_method_context_factory.cc",
"ime/linux/fake_input_method_context_factory.h",
"ime/linux/linux_input_method_context.h",
"ime/linux/linux_input_method_context_factory.cc",
"ime/linux/linux_input_method_context_factory.h",
"ime/mock_input_method.cc",
"ime/mock_input_method.h",
"ime/remote_input_method_delegate_win.h",
"ime/remote_input_method_win.cc",
"ime/remote_input_method_win.h",
"ime/text_input_client.cc",
"ime/text_input_client.h",
"ime/text_input_focus_manager.cc",
"ime/text_input_focus_manager.h",
"ime/text_input_type.h",
"ime/win/imm32_manager.cc",
"ime/win/imm32_manager.h",
"ime/win/tsf_input_scope.cc",
"ime/win/tsf_input_scope.h",
]
if (!use_aura || (!is_linux && !use_ozone)) {
sources -= [
"ime/input_method_auralinux.cc",
"ime/input_method_auralinux.h",
]
}
if (!toolkit_views && !use_aura) {
sources -= [
"ime/input_method_factory.cc",
"ime/input_method_factory.h",
"ime/input_method_minimal.cc",
"ime/input_method_minimal.h",
]
}
if (is_chromeos) {
deps += [
"//chromeos",
]
}
if (use_pango) {
configs += [ "//build/config/linux:pangocairo" ]
} else {
sources -= [
"ime/composition_text_util_pango.cc",
"ime/composition_text_util_pango.h",
]
}
}
if (is_ios) {
sources += [
"l10n/l10n_util_mac.h",
"l10n/l10n_util_mac.mm",
]
} else {
deps += [ "//ui/base/ime" ]
# http://crbug.com/408648 Circular includes from the ime sub-target to this
# one.
allow_circular_includes_from = [ "//ui/base/ime" ]
}
if (toolkit_views) {
......@@ -572,7 +673,7 @@ source_set("test_support") {
"//ui/gfx/geometry",
]
if (!is_ios) {
if (build_ime) {
sources += [
"ime/dummy_input_method.cc",
"ime/dummy_input_method.h",
......@@ -644,14 +745,6 @@ test("unittests") {
"cocoa/nsgraphics_context_additions_unittest.mm",
"cocoa/tracking_area_unittest.mm",
"dragdrop/os_exchange_data_provider_aurax11_unittest.cc",
"ime/candidate_window_unittest.cc",
"ime/chromeos/character_composer_unittest.cc",
"ime/composition_text_util_pango_unittest.cc",
"ime/input_method_base_unittest.cc",
"ime/input_method_chromeos_unittest.cc",
"ime/remote_input_method_win_unittest.cc",
"ime/win/imm32_manager_unittest.cc",
"ime/win/tsf_input_scope_unittest.cc",
"models/list_model_unittest.cc",
"models/list_selection_model_unittest.cc",
"models/tree_node_model_unittest.cc",
......@@ -674,6 +767,19 @@ test("unittests") {
}
}
if (build_ime) {
sources += [
"ime/candidate_window_unittest.cc",
"ime/chromeos/character_composer_unittest.cc",
"ime/composition_text_util_pango_unittest.cc",
"ime/input_method_base_unittest.cc",
"ime/input_method_chromeos_unittest.cc",
"ime/remote_input_method_win_unittest.cc",
"ime/win/imm32_manager_unittest.cc",
"ime/win/tsf_input_scope_unittest.cc",
]
}
deps = [
"//base",
"//base/allocator",
......
ui/base/ime/BUILD.gn deleted 100644 → 0
View file @ b1f28c8f
# Copyright 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import("//build/config/ui.gni")
source_set("ime") {
# GYP version: ui/base/ime/ime.gypi, which is included into ui_base
sources = [
"../ui_base_export.h",
"candidate_window.cc",
"candidate_window.h",
"chromeos/character_composer.cc",
"chromeos/character_composer.h",
"chromeos/ime_bridge.cc",
"chromeos/ime_bridge.h",
"chromeos/ime_keymap.cc",
"chromeos/ime_keymap.h",
"chromeos/mock_ime_candidate_window_handler.cc",
"chromeos/mock_ime_candidate_window_handler.h",
"chromeos/mock_ime_engine_handler.cc",
"chromeos/mock_ime_engine_handler.h",
"chromeos/mock_ime_input_context_handler.cc",
"chromeos/mock_ime_input_context_handler.h",
"composition_text.cc",
"composition_text.h",
"composition_text_util_pango.cc",
"composition_text_util_pango.h",
"composition_underline.h",
"dummy_input_method_delegate.cc",
"dummy_input_method_delegate.h",
"infolist_entry.cc",
"infolist_entry.h",
"input_method.h",
"input_method_auralinux.cc",
"input_method_auralinux.h",
"input_method_base.cc",
"input_method_base.h",
"input_method_chromeos.cc",
"input_method_chromeos.h",
"input_method_delegate.h",
"input_method_factory.cc",
"input_method_factory.h",
"input_method_initializer.cc",
"input_method_initializer.h",
"input_method_mac.h",
"input_method_mac.mm",
"input_method_minimal.cc",
"input_method_minimal.h",
"input_method_observer.h",
"input_method_win.cc",
"input_method_win.h",
"linux/fake_input_method_context.cc",
"linux/fake_input_method_context.h",
"linux/fake_input_method_context_factory.cc",
"linux/fake_input_method_context_factory.h",
"linux/linux_input_method_context.h",
"linux/linux_input_method_context_factory.cc",
"linux/linux_input_method_context_factory.h",
"mock_input_method.cc",
"mock_input_method.h",
"remote_input_method_delegate_win.h",
"remote_input_method_win.cc",
"remote_input_method_win.h",
"text_input_client.cc",
"text_input_client.h",
"text_input_focus_manager.cc",
"text_input_focus_manager.h",
"text_input_type.h",
"win/imm32_manager.cc",
"win/imm32_manager.h",
"win/tsf_input_scope.cc",
"win/tsf_input_scope.h",
]
defines = [ "UI_BASE_IMPLEMENTATION" ]
deps = [
"//skia",
"//ui/events",
]
if (!toolkit_views && !use_aura) {
sources -= [
"input_method_factory.cc",
"input_method_factory.h",
"input_method_minimal.cc",
"input_method_minimal.h",
]
}
if (is_chromeos) {
deps += [
"//chromeos",
]
}
if (!use_aura || (!is_linux && !use_ozone)) {
sources -= [
"input_method_auralinux.cc",
"input_method_auralinux.h",
]
}
if (use_pango) {
configs += [ "//build/config/linux:pangocairo" ]
} else {
sources -= [
"composition_text_util_pango.cc",
"composition_text_util_pango.h",
]
}
if (is_android) {
deps -= [ "//ui/events" ]
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment