vk: Move //ui/keyboard to //ash/keyboard/ui

To make this CL as small as possible, we're just moving the directories
and updating any references.

We had to add a few DEPS from chrome to ash/keyboard/ui.

In future patches well consider what files should go where and whether
we want to keep keyboard code in its own self-contained module.

TBR=benwells@chromium.org

Bug: 961568
Change-Id: I27c140ab51709ebb89910fe43b96bf64a38100d8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1605584
Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Oliver Chang <ochang@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#659376}

BUILD.gn

@@ -402,13 +402,13 @@ group("gn_all") {
       "//ash:ash_unittests",
       "//ash/app_list:app_list_demo",
       "//ash/app_list:app_list_unittests",
+      "//ash/keyboard/ui:keyboard_unittests",
       "//chrome/test:usage_time_limit_unittests",
       "//chromeos:chromeos_unittests",
       "//chromeos/components:chromeos_components_unittests",
       "//chromeos/components/proximity_auth:proximity_auth_unittests",
       "//components/session_manager/core",
       "//ui/chromeos:ui_chromeos_unittests",
-      "//ui/keyboard:keyboard_unittests",
     ]
   }
 

ash/BUILD.gn

@@ -1321,6 +1321,8 @@ component("ash") {
     "//ash/components/fast_ink",
     "//ash/components/shortcut_viewer",
     "//ash/keyboard/arc",
+    "//ash/keyboard/ui",
+    "//ash/keyboard/ui:mojom",
     "//ash/login/resources:resources_grit",
     "//ash/system/message_center/arc",
     "//base",
@@ -1418,8 +1420,6 @@ component("ash") {
     "//ui/events/devices",
     "//ui/events/devices/mojo",
     "//ui/events/ozone:events_ozone",
-    "//ui/keyboard",
-    "//ui/keyboard:mojom",
     "//ui/message_center",
     "//ui/native_theme",
     "//ui/ozone",
@@ -1918,6 +1918,9 @@ test("ash_unittests") {
     "//ash/components/fast_ink:unit_tests",
     "//ash/components/shortcut_viewer:unit_tests",
     "//ash/keyboard/arc",
+    "//ash/keyboard/ui",
+    "//ash/keyboard/ui:mojom",
+    "//ash/keyboard/ui:test_support",
     "//ash/public/cpp",
     "//ash/public/cpp:manifest",
     "//ash/public/cpp:manifest_for_tests",
@@ -2000,9 +2003,6 @@ test("ash_unittests") {
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gl:test_support",
-    "//ui/keyboard",
-    "//ui/keyboard:mojom",
-    "//ui/keyboard:test_support",
     "//ui/message_center",
     "//ui/message_center:test_support",
     "//ui/message_center/public/cpp",
@@ -2227,6 +2227,8 @@ static_library("test_support") {
     "//chromeos/dbus/system_clock",
 
     # TODO(https://crbug.com/644355): Remove Shill dependencies.
+    "//ash/keyboard/ui",
+    "//ash/keyboard/ui:test_support",
     "//chromeos/network:test_support",
     "//chromeos/system",
     "//components/account_id",
@@ -2255,8 +2257,6 @@ static_library("test_support") {
     "//ui/events/devices",
     "//ui/gl",
     "//ui/gl:test_support",
-    "//ui/keyboard",
-    "//ui/keyboard:test_support",
     "//ui/message_center",
     "//ui/message_center/public/cpp",
     "//ui/views",

ash/accelerators/accelerator_controller_impl.cc

@@ -24,6 +24,7 @@
 #include "ash/focus_cycler.h"
 #include "ash/ime/ime_controller.h"
 #include "ash/ime/ime_switch_type.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/kiosk_next/kiosk_next_shell_controller.h"
 #include "ash/magnifier/docked_magnifier_controller.h"
 #include "ash/magnifier/magnification_controller.h"
@@ -92,7 +93,6 @@
 #include "ui/events/devices/input_device.h"
 #include "ui/events/devices/input_device_manager.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/message_center/message_center.h"
 
 namespace ash {

ash/accessibility/accessibility_controller.cc

@@ -16,6 +16,7 @@
 #include "ash/events/switch_access_event_handler.h"
 #include "ash/high_contrast/high_contrast_controller.h"
 #include "ash/keyboard/ash_keyboard_controller.h"
+#include "ash/keyboard/ui/keyboard_util.h"
 #include "ash/policy/policy_recommendation_restorer.h"
 #include "ash/public/cpp/ash_pref_names.h"
 #include "ash/public/cpp/notification_utils.h"
@@ -42,7 +43,6 @@
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor_type.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/keyboard/keyboard_util.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/public/cpp/notifier_id.h"
 #include "ui/wm/core/cursor_manager.h"

ash/accessibility/accessibility_controller_unittest.cc

@@ -8,6 +8,7 @@
 
 #include "ash/accessibility/accessibility_observer.h"
 #include "ash/accessibility/test_accessibility_controller_client.h"
+#include "ash/keyboard/ui/keyboard_util.h"
 #include "ash/magnifier/docked_magnifier_controller.h"
 #include "ash/public/cpp/ash_constants.h"
 #include "ash/public/cpp/ash_pref_names.h"
@@ -21,7 +22,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/dbus/power/fake_power_manager_client.h"
 #include "components/prefs/pref_service.h"
-#include "ui/keyboard/keyboard_util.h"
 #include "ui/message_center/message_center.h"
 
 using message_center::MessageCenter;

ash/accessibility/touch_exploration_manager.cc

@@ -10,6 +10,7 @@
 #include "ash/accessibility/accessibility_controller.h"
 #include "ash/accessibility/accessibility_focus_ring_controller.h"
 #include "ash/accessibility/touch_exploration_controller.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_types.h"
 #include "ash/public/interfaces/accessibility_focus_ring_controller.mojom.h"
 #include "ash/root_window_controller.h"
@@ -23,7 +24,6 @@
 #include "extensions/common/constants.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {

ash/accessibility/touch_exploration_manager.h

@@ -11,11 +11,11 @@
 #include "ash/accessibility/touch_accessibility_enabler.h"
 #include "ash/accessibility/touch_exploration_controller.h"
 #include "ash/ash_export.h"
+#include "ash/keyboard/ui/keyboard_controller_observer.h"
 #include "ash/shell_observer.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "ui/display/display_observer.h"
-#include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace chromeos {

ash/app_list/BUILD.gn

@@ -104,6 +104,7 @@ component("app_list") {
     "//ash/assistant/ui",
     "//ash/assistant/ui:constants",
     "//ash/assistant/util",
+    "//ash/keyboard/ui",
     "//ash/public/cpp/app_list/vector_icons",
     "//ash/public/cpp/vector_icons",
     "//ash/resources/vector_icons",
@@ -133,7 +134,6 @@ component("app_list") {
     "//ui/events",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/keyboard/",
     "//ui/resources",
     "//ui/strings",
     "//ui/views",
@@ -220,6 +220,7 @@ test("app_list_unittests") {
   deps = [
     ":app_list",
     ":test_support",
+    "//ash/keyboard/ui",
     "//ash/public/cpp/app_list/vector_icons",
     "//base",
     "//base/test:test_support",
@@ -238,7 +239,6 @@ test("app_list_unittests") {
     "//ui/events:test_support",
     "//ui/gfx:test_support",
     "//ui/gl:test_support",
-    "//ui/keyboard",
     "//ui/resources",
     "//ui/views",
     "//ui/views:test_support",

ash/app_list/app_list_controller_impl.h

@@ -20,6 +20,7 @@
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/home_screen/home_launcher_gesture_handler_observer.h"
 #include "ash/home_screen/home_screen_delegate.h"
+#include "ash/keyboard/ui/keyboard_controller_observer.h"
 #include "ash/public/cpp/assistant/default_voice_interaction_observer.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/public/interfaces/app_list.mojom.h"
@@ -35,7 +36,6 @@
 #include "components/sync/model/string_ordinal.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "ui/keyboard/keyboard_controller_observer.h"
 
 class PrefRegistrySimple;
 

ash/app_list/app_list_presenter_delegate_impl.cc

@@ -11,6 +11,7 @@
 #include "ash/app_list/views/app_list_view.h"
 #include "ash/app_list/views/contents_view.h"
 #include "ash/app_list/views/search_box_view.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_list/app_list_switches.h"
 #include "ash/public/cpp/ash_switches.h"
 #include "ash/public/cpp/shelf_types.h"
@@ -31,7 +32,6 @@
 #include "ui/display/manager/display_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/coordinate_conversion.h"
 

ash/app_list/app_list_presenter_delegate_impl.h

@@ -9,11 +9,11 @@
 
 #include "ash/app_list/presenter/app_list_presenter_delegate.h"
 #include "ash/ash_export.h"
+#include "ash/keyboard/ui/keyboard_controller_observer.h"
 #include "base/macros.h"
 #include "base/scoped_observer.h"
 #include "ui/display/display_observer.h"
 #include "ui/events/event_handler.h"
-#include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace app_list {
 class AppListPresenterImpl;

ash/app_list/app_list_presenter_delegate_unittest.cc

@@ -16,6 +16,9 @@
 #include "ash/app_list/views/contents_view.h"
 #include "ash/app_list/views/search_box_view.h"
 #include "ash/app_list/views/test/apps_grid_view_test_api.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
+#include "ash/keyboard/ui/public/keyboard_switches.h"
+#include "ash/keyboard/ui/test/keyboard_test_util.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/app_list/app_list_switches.h"
@@ -57,9 +60,6 @@
 #include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/keyboard/keyboard_controller.h"
-#include "ui/keyboard/public/keyboard_switches.h"
-#include "ui/keyboard/test/keyboard_test_util.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace ash {

ash/app_list/views/app_list_folder_view.cc

@@ -21,6 +21,7 @@
 #include "ash/app_list/views/page_switcher.h"
 #include "ash/app_list/views/search_box_view.h"
 #include "ash/app_list/views/top_icon_animation_view.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/pagination/pagination_model.h"
@@ -33,7 +34,6 @@
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect_conversions.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/background.h"

ash/app_list/views/app_list_view.cc

@@ -17,6 +17,7 @@
 #include "ash/app_list/views/horizontal_page_container.h"
 #include "ash/app_list/views/search_box_view.h"
 #include "ash/assistant/ui/assistant_ui_constants.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/ash_features.h"
@@ -48,7 +49,6 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/skia_util.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/controls/image_view.h"

ash/app_list/views/app_list_view_unittest.cc

@@ -36,6 +36,7 @@
 #include "ash/app_list/views/search_result_view.h"
 #include "ash/app_list/views/suggestion_chip_container_view.h"
 #include "ash/app_list/views/test/apps_grid_view_test_api.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/pagination/pagination_model.h"
@@ -55,7 +56,6 @@
 #include "ui/chromeos/search_box/search_box_constants.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/events/event_utils.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view_model.h"

ash/app_list/views/apps_grid_view_unittest.cc

@@ -29,6 +29,7 @@
 #include "ash/app_list/views/search_result_tile_item_view.h"
 #include "ash/app_list/views/suggestion_chip_container_view.h"
 #include "ash/app_list/views/test/apps_grid_view_test_api.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/app_list/app_list_switches.h"
@@ -47,7 +48,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/events/event_utils.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"

ash/app_list/views/contents_view.cc

@@ -21,6 +21,7 @@
 #include "ash/app_list/views/search_result_list_view.h"
 #include "ash/app_list/views/search_result_page_view.h"
 #include "ash/app_list/views/search_result_tile_item_list_view.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/app_list/app_list_switches.h"
@@ -29,7 +30,6 @@
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/views/accessibility/view_accessibility.h"
 #include "ui/views/view_model.h"
 #include "ui/views/widget/widget.h"

ash/app_list/views/folder_background_view.cc

@@ -5,7 +5,7 @@
 #include "ash/app_list/views/folder_background_view.h"
 
 #include "ash/app_list/views/app_list_folder_view.h"
-#include "ui/keyboard/keyboard_controller.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 
 namespace app_list {
 

ash/app_list/views/search_box_view.cc

@@ -19,6 +19,7 @@
 #include "ash/app_list/views/expand_arrow_view.h"
 #include "ash/app_list/views/search_result_base_view.h"
 #include "ash/app_list/views/search_result_page_view.h"
+#include "ash/keyboard/ui/keyboard_controller.h"
 #include "ash/public/cpp/app_list/app_list_config.h"
 #include "ash/public/cpp/app_list/app_list_features.h"
 #include "ash/public/cpp/app_list/vector_icons/vector_icons.h"
@@ -40,7 +41,6 @@
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/paint_vector_icon.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/strings/grit/ui_strings.h"
 #include "ui/views/border.h"
 #include "ui/views/context_menu_controller.h"

ash/assistant/assistant_ui_controller.h

@@ -18,13 +18,13 @@
 #include "ash/assistant/ui/assistant_view_delegate.h"
 #include "ash/assistant/ui/caption_bar.h"
 #include "ash/highlighter/highlighter_controller.h"
+#include "ash/keyboard/ui/keyboard_controller_observer.h"
 #include "base/macros.h"
 #include "base/optional.h"
 #include "base/timer/timer.h"
 #include "ui/display/display_observer.h"
 #include "ui/events/event_observer.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/keyboard/keyboard_controller_observer.h"
 #include "ui/views/event_monitor.h"
 #include "ui/views/widget/widget_observer.h"
 

ash/keyboard/OWNERS

@@ -1,3 +1,3 @@
-file://ui/keyboard/OWNERS
+file://ash/keyboard/ui/OWNERS
 
 # COMPONENT: UI>Input>VirtualKeyboard

ash/keyboard/ash_keyboard_controller.cc

@@ -4,6 +4,9 @@
 
 #include "ash/keyboard/ash_keyboard_controller.h"
 
+#include "ash/keyboard/ui/keyboard_controller.h"
+#include "ash/keyboard/ui/keyboard_ui_factory.h"
+#include "ash/keyboard/ui/public/keyboard_switches.h"
 #include "ash/keyboard/virtual_keyboard_controller.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/session/session_controller_impl.h"
@@ -12,9 +15,6 @@
 #include "base/command_line.h"
 #include "ui/base/ui_base_features.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/keyboard/keyboard_controller.h"
-#include "ui/keyboard/keyboard_ui_factory.h"
-#include "ui/keyboard/public/keyboard_switches.h"
 #include "ui/wm/core/coordinate_conversion.h"
 
 using keyboard::mojom::KeyboardConfig;