athena: Add support for virtual keyboard.

athena/athena.gyp

Index: athena/athena.gyp
diff --git a/athena/athena.gyp b/athena/athena.gyp
index 6bdc07b9d3adbb3e66082a2d8a3e70c8a1cb912a..65ed34e8d1d190f53f498c232a3f6ee1a1020ef5 100644
--- a/athena/athena.gyp
+++ b/athena/athena.gyp
@@ -31,8 +31,10 @@
         'activity/public/activity_manager.h',
         'activity/public/activity_view_manager.h',
         'activity/public/activity_view_model.h',
-	# move athena_export.h to common/
+        # move athena_export.h to common/
         'athena_export.h',
+        'common/fill_layout_manager.cc',
+        'common/fill_layout_manager.h',
         'common/switches.cc',
         'common/switches.h',
         'home/app_list_view_delegate.cc',
@@ -40,11 +42,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/accelerator_manager_impl.cc',
+        'input/accelerator_manager_impl.h',
+        'input/input_manager_impl.cc',
+        'input/public/input_manager.h',
+        'input/public/accelerator_manager.h',
         'screen/background_controller.cc',
         'screen/background_controller.h',
         'screen/public/screen_manager.h',
@@ -62,8 +64,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 +85,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',
       ],
     },
     {