summaryrefslogtreecommitdiffstats
path: root/ui/keyboard
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-02 20:39:12 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-02 20:39:12 +0000
commit604828c4e47efaa4a560710333d29b79d906034d (patch)
tree5dcfd0c061b0b8e8651863caa55b61437491a670 /ui/keyboard
parentfd72f38a140ffe063340b2c9c55f347accaf1c33 (diff)
downloadchromium_src-604828c4e47efaa4a560710333d29b79d906034d.zip
chromium_src-604828c4e47efaa4a560710333d29b79d906034d.tar.gz
chromium_src-604828c4e47efaa4a560710333d29b79d906034d.tar.bz2
Work on GN build, mostly in //ui
This fills out a number of ui targets and does some changes to the resources to match the GYP build. In particular, we had a number of different ui/resources targets that were depended on independently. The GYP build has only one, so I combined them into a meta "ui/resources" target. Adds a grit repack template. TBR=ajwong Review URL: https://codereview.chromium.org/369603004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard')
-rw-r--r--ui/keyboard/BUILD.gn89
-rw-r--r--ui/keyboard/keyboard.gyp2
2 files changed, 91 insertions, 0 deletions
diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn
new file mode 100644
index 0000000..1b3c87b
--- /dev/null
+++ b/ui/keyboard/BUILD.gn
@@ -0,0 +1,89 @@
+# 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("//tools/grit/grit_rule.gni")
+
+component("keyboard") {
+ sources = [
+ "keyboard.cc",
+ "keyboard.h",
+ "keyboard_constants.cc",
+ "keyboard_constants.h",
+ "keyboard_controller.cc",
+ "keyboard_controller.h",
+ "keyboard_controller_observer.h",
+ "keyboard_controller_proxy.cc",
+ "keyboard_controller_proxy.h",
+ "keyboard_layout_manager.h",
+ "keyboard_layout_manager.cc",
+ "keyboard_export.h",
+ "keyboard_switches.cc",
+ "keyboard_switches.h",
+ "keyboard_util.cc",
+ "keyboard_util.h",
+ ]
+
+ defines = [ "KEYBOARD_IMPLEMENTATION" ]
+
+ deps = [
+ ":resources",
+ "//base",
+ "//base/third_party/dynamic_annotations",
+ "//content/public/browser",
+ "//ipc",
+ "//skia",
+ "//url",
+ "//ui/aura",
+ "//ui/base",
+ "//ui/compositor",
+ "//ui/events",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ "//ui/wm",
+ ]
+}
+
+grit("resources_grit") {
+ source = "keyboard_resources.grd"
+}
+
+copy("resources") {
+ sources = [ "$target_gen_dir/keyboard_resources.pak" ]
+ outputs = [ "$root_out_dir/keyboard_resources.pak" ]
+ deps = [ ":resources_grit" ]
+ forward_dependent_configs_from = deps
+}
+
+# TODO(GYP) enable this when all dependencies are resolved. Some transitive
+# deps aren't done yet.
+if (false) {
+
+test("keyboard_unittests") {
+ sources = [
+ "test/run_all_unittests.cc",
+ "keyboard_controller_unittest.cc",
+ ]
+
+ deps = [
+ ":keyboard",
+ "//base",
+ "//base/allocator",
+ "//base/test:test_support",
+ "//content",
+ "//skia",
+ "//testing/gtest",
+ "//ui/aura",
+ "//ui/aura:test_support",
+ "//ui/base",
+ "//ui/compositor",
+ "//ui/compositor:test_support",
+ "//ui/gfx",
+ "//ui/gfx/geometry",
+ "//ui/resources:ui_test_pak",
+ "//ui/wm",
+ "//url",
+ ]
+}
+
+}
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp
index e780048..34c265d 100644
--- a/ui/keyboard/keyboard.gyp
+++ b/ui/keyboard/keyboard.gyp
@@ -8,6 +8,7 @@
},
'targets': [
{
+ # GN version: //ui/keyboard:resources
'target_name': 'keyboard_resources',
'type': 'none',
'variables': {
@@ -33,6 +34,7 @@
],
},
{
+ # GN version: //ui/keyboard
'target_name': 'keyboard',
'type': '<(component)',
'dependencies': [