diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 17:42:56 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-23 17:42:56 +0000 |
| commit | f1d5c3ad84c8148cf8e0e36ef9622d865b682f34 (patch) | |
| tree | 673bf62a1d8368f14154c962f5327a14167af9a9 /ui/keyboard/keyboard.gyp | |
| parent | 72fe5d96250af420959d173f86cf5e3330a8ddfd (diff) | |
| download | chromium_src-f1d5c3ad84c8148cf8e0e36ef9622d865b682f34.zip chromium_src-f1d5c3ad84c8148cf8e0e36ef9622d865b682f34.tar.gz chromium_src-f1d5c3ad84c8148cf8e0e36ef9622d865b682f34.tar.bz2 | |
keyboard: Simplify initialization and use in ash_shell.
After this change, executables that want to use the keyboard need to:
* add 'keyboard' and 'keyboard_resources' as dependencies. Repacking
keyboard_resources.pak is no longer necessary.
* call keyboard::InitializeKeyboard() during startup. This installs
the necessary pak file, and sets up a WebUIControllerFactory to
make sure the keyboard gets the correct WebUIController.
* create a KeyboardControllerProxy and a KeyboardController.
BUG=none
Review URL: https://codereview.chromium.org/14241037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195835 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard/keyboard.gyp')
| -rw-r--r-- | ui/keyboard/keyboard.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ui/keyboard/keyboard.gyp b/ui/keyboard/keyboard.gyp index 8d37845..749f9dd 100644 --- a/ui/keyboard/keyboard.gyp +++ b/ui/keyboard/keyboard.gyp @@ -23,12 +23,22 @@ }, ], 'includes': [ '../../build/grit_target.gypi' ], + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/keyboard_resources.pak', + ], + }, + ], }, { 'target_name': 'keyboard', 'type': '<(component)', 'dependencies': [ '../../base/base.gyp:base', + '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../../build/temp_gyp/googleurl.gyp:googleurl', '../../content/content.gyp:content_browser', '../../skia/skia.gyp:skia', '../aura/aura.gyp:aura', @@ -40,10 +50,13 @@ 'KEYBOARD_IMPLEMENTATION', ], 'sources': [ + 'keyboard.cc', + 'keyboard.h', 'keyboard_constants.cc', 'keyboard_constants.h', 'keyboard_controller.cc', 'keyboard_controller.h', + 'keyboard_controller_proxy.cc', 'keyboard_controller_proxy.h', 'keyboard_export.h', 'keyboard_switches.cc', |