diff options
| author | ben <ben@chromium.org> | 2015-10-09 17:45:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-10 00:45:50 +0000 |
| commit | 974286a2cb68813b64c27c0fcd99cdfd899a007a (patch) | |
| tree | a7d987599a5551deb75d0bef9877712e3e47db2f /ash/ash.gyp | |
| parent | 77970f1c3cd71d535a248d6e15f14081312b300a (diff) | |
| download | chromium_src-974286a2cb68813b64c27c0fcd99cdfd899a007a.zip chromium_src-974286a2cb68813b64c27c0fcd99cdfd899a007a.tar.gz chromium_src-974286a2cb68813b64c27c0fcd99cdfd899a007a.tar.bz2 | |
Extract content dependency from keyboard code
Move content specific stuff to content subdir.
KeyboardControllerProxy -> KeyboardUI
Restructure targets.
R=sky@chromium.org
http://crbug.com/332504
Review URL: https://codereview.chromium.org/1392713002
Cr-Commit-Position: refs/heads/master@{#353441}
Diffstat (limited to 'ash/ash.gyp')
| -rw-r--r-- | ash/ash.gyp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 4994964..83fbb9b 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -724,6 +724,8 @@ 'test/task_switch_time_tracker_test_api.h', 'test/test_activation_delegate.cc', 'test/test_activation_delegate.h', + 'test/test_keyboard_ui.cc', + 'test/test_keyboard_ui.h', 'test/test_lock_state_controller_delegate.cc', 'test/test_lock_state_controller_delegate.h', 'test/test_overlay_delegate.cc', @@ -760,8 +762,6 @@ 'test/virtual_keyboard_test_helper.h', ], 'ash_test_support_with_content_sources': [ - 'test/content/keyboard_controller_proxy_stub.cc', - 'test/content/keyboard_controller_proxy_stub.h', 'test/content/test_shell_content_state.cc', 'test/content/test_shell_content_state.h', ], @@ -969,6 +969,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/keyboard/keyboard.gyp:keyboard', + '../ui/keyboard/keyboard.gyp:keyboard_with_content', '../ui/message_center/message_center.gyp:message_center', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/strings/ui_strings.gyp:ui_strings', @@ -1063,6 +1064,7 @@ '../ui/events/events.gyp:events', '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', + '../ui/keyboard/keyboard.gyp:keyboard_with_content', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/strings/ui_strings.gyp:ui_strings', '../ui/views/controls/webview/webview.gyp:webview', @@ -1164,6 +1166,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/keyboard/keyboard.gyp:keyboard', + '../ui/keyboard/keyboard.gyp:keyboard_with_content', '../ui/message_center/message_center.gyp:message_center', '../ui/message_center/message_center.gyp:message_center_test_support', '../ui/resources/ui_resources.gyp:ui_resources', @@ -1264,6 +1267,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/keyboard/keyboard.gyp:keyboard', + '../ui/keyboard/keyboard.gyp:keyboard_with_content', '../ui/message_center/message_center.gyp:message_center', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/views/examples/examples.gyp:views_examples_lib', |