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

Unified Diff: athena/athena.gyp

Issue 335793005: athena: Add support for virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 months 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 | « no previous file | athena/main/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 6bdc07b9d3adbb3e66082a2d8a3e70c8a1cb912a..1c543f6da5eabbb3765a8a3569a916d4fb7d78cc 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -40,11 +40,11 @@
'home/home_card_impl.cc',
'home/public/app_model_builder.h',
'home/public/home_card.h',
- 'input/public/input_manager.h',
- 'input/public/accelerator_manager.h',
- 'input/input_manager_impl.cc',
- 'input/accelerator_manager_impl.cc',
- 'input/accelerator_manager_impl.h',
+ 'input/public/input_manager.h',
+ 'input/public/accelerator_manager.h',
+ 'input/input_manager_impl.cc',
+ 'input/accelerator_manager_impl.cc',
+ 'input/accelerator_manager_impl.h',
bshe 2014/06/18 17:33:42 nit: order is wrong.
sadrul 2014/06/18 19:35:07 Done.
'screen/background_controller.cc',
'screen/background_controller.h',
'screen/public/screen_manager.h',
@@ -62,8 +62,12 @@
'type': 'static_library',
'dependencies': [
'athena_lib',
+ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../content/content.gyp:content_browser',
'../ui/app_list/app_list.gyp:app_list',
+ '../ui/keyboard/keyboard.gyp:keyboard',
+ '../ui/keyboard/keyboard.gyp:keyboard_resources',
+ '../third_party/WebKit/public/blink.gyp:blink',
'../ui/views/controls/webview/webview.gyp:webview',
'../skia/skia.gyp:skia',
],
@@ -79,6 +83,14 @@
'content/app_activity.cc',
'content/web_activity.h',
'content/web_activity.cc',
+ 'virtual_keyboard/public/virtual_keyboard_bindings.h',
+ 'virtual_keyboard/public/virtual_keyboard_manager.h',
+ 'virtual_keyboard/virtual_keyboard_bindings_impl.cc',
+ 'virtual_keyboard/virtual_keyboard_manager_impl.cc',
+ 'virtual_keyboard/vk_message_handler.cc',
+ 'virtual_keyboard/vk_message_handler.h',
+ 'virtual_keyboard/vk_webui_controller.cc',
+ 'virtual_keyboard/vk_webui_controller.h',
],
},
{
« no previous file with comments | « no previous file | athena/main/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698