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 /chrome/chrome_repack_resources.gypi | |
| 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 'chrome/chrome_repack_resources.gypi')
| -rw-r--r-- | chrome/chrome_repack_resources.gypi | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index b045f70..35d91dc 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -27,11 +27,6 @@ '<(grit_out_dir)/devtools_discovery_page_resources.pak', ], }], - ['use_aura==1', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/keyboard/keyboard_resources.pak', - ], - }], ], }, 'inputs': [ |