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

Unified Diff: ash/ash.gyp

Issue 62833010: Reland "Add a full screen virtual keyboard to virtual keyboard root window" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: format nit. The main change is patchset 2 Created 7 years, 1 month 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 | ash/display/display_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index 9dacdc704e37d08c26f72c9bb6120beb0fb92d6b..e3b79e85aa6a45d60af7315182facba1686d5cf9 100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -148,8 +148,6 @@
'host/root_window_host_factory.cc',
'host/root_window_host_factory.h',
'host/root_window_host_factory_win.cc',
- 'keyboard_controller_proxy_stub.cc',
- 'keyboard_controller_proxy_stub.h',
'keyboard_overlay/keyboard_overlay_delegate.cc',
'keyboard_overlay/keyboard_overlay_delegate.h',
'keyboard_overlay/keyboard_overlay_view.cc',
@@ -637,6 +635,8 @@
'sources': [
'shell/toplevel_window.cc',
'shell/toplevel_window.h',
+ 'shell/keyboard_controller_proxy_stub.cc',
+ 'shell/keyboard_controller_proxy_stub.h',
'test/app_list_controller_test_api.cc',
'test/app_list_controller_test_api.h',
'test/ash_test_base.cc',
@@ -752,6 +752,7 @@
'display/display_info_unittest.cc',
'display/display_manager_unittest.cc',
'display/mirror_window_controller_unittest.cc',
+ 'display/virtual_keyboard_window_controller_unittest.cc',
'display/mouse_cursor_event_filter_unittest.cc',
'display/resolution_notification_controller_unittest.cc',
'display/root_window_transformers_unittest.cc',
@@ -947,6 +948,8 @@
'shell/context_menu.cc',
'shell/context_menu.h',
'shell/example_factory.h',
+ 'shell/keyboard_controller_proxy_stub.cc',
+ 'shell/keyboard_controller_proxy_stub.h',
'shell/launcher_delegate_impl.cc',
'shell/launcher_delegate_impl.h',
'shell/lock_view.cc',
« no previous file with comments | « no previous file | ash/display/display_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698