Commit 8d91252f authored by James Cook's avatar James Cook Committed by Commit Bot

chromeos: Move ash keyboard code and add OWNERS

Move the code to //ash/keyboard. Add yhanada to OWNERS.

This should make it easier for the people working on keyboard support to
get approvals from nearby time zones.

Bug: none
Change-Id: Idbb3023913c7e34daad9b42718dd90ad7ed8e319
Reviewed-on: https://chromium-review.googlesource.com/1105396Reviewed-by: default avatarYuichiro Hanada <yhanada@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568304}
parent 092ee378
......@@ -304,6 +304,10 @@ component("ash") {
"keyboard/keyboard_ui_mash.cc",
"keyboard/keyboard_ui_mash.h",
"keyboard/keyboard_ui_observer.h",
"keyboard/virtual_keyboard_container_layout_manager.cc",
"keyboard/virtual_keyboard_container_layout_manager.h",
"keyboard/virtual_keyboard_controller.cc",
"keyboard/virtual_keyboard_controller.h",
"laser/laser_pointer_controller.cc",
"laser/laser_pointer_controller.h",
"laser/laser_pointer_view.cc",
......@@ -1005,10 +1009,6 @@ component("ash") {
"utility/screenshot_controller.h",
"utility/transformer_util.cc",
"utility/transformer_util.h",
"virtual_keyboard_container_layout_manager.cc",
"virtual_keyboard_container_layout_manager.h",
"virtual_keyboard_controller.cc",
"virtual_keyboard_controller.h",
"voice_interaction/voice_interaction_controller.cc",
"voice_interaction/voice_interaction_controller.h",
"voice_interaction/voice_interaction_observer.h",
......@@ -1713,6 +1713,7 @@ test("ash_unittests") {
"highlighter/highlighter_gesture_util_unittest.cc",
"ime/ime_controller_unittest.cc",
"ime/ime_focus_handler_unittest.cc",
"keyboard/virtual_keyboard_controller_unittest.cc",
"laser/laser_pointer_controller_unittest.cc",
"laser/laser_segment_utils_unittest.cc",
"lock_screen_action/lock_screen_action_background_controller_impl_unittest.cc",
......@@ -1874,7 +1875,6 @@ test("ash_unittests") {
"tray_action/test_tray_action_client.h",
"tray_action/tray_action_unittest.cc",
"utility/screenshot_controller_unittest.cc",
"virtual_keyboard_controller_unittest.cc",
"voice_interaction/voice_interaction_controller_unittest.cc",
"wallpaper/wallpaper_controller_unittest.cc",
"wallpaper/wallpaper_utils/wallpaper_color_calculator_unittest.cc",
......
file://ui/keyboard/OWNERS
# COMPONENT: UI>Input>VirtualKeyboard
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ash/virtual_keyboard_container_layout_manager.h"
#include "ash/keyboard/virtual_keyboard_container_layout_manager.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ui/aura/window.h"
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef ASH_VIRTUAL_KEYBOARD_CONTAINER_LAYOUT_MANAGER_H_
#define ASH_VIRTUAL_KEYBOARD_CONTAINER_LAYOUT_MANAGER_H_
#ifndef ASH_KEYBOARD_VIRTUAL_KEYBOARD_CONTAINER_LAYOUT_MANAGER_H_
#define ASH_KEYBOARD_VIRTUAL_KEYBOARD_CONTAINER_LAYOUT_MANAGER_H_
#include "base/macros.h"
#include "ui/aura/layout_manager.h"
......@@ -35,4 +35,4 @@ class VirtualKeyboardContainerLayoutManager : public aura::LayoutManager {
} // namespace ash
#endif // ASH_VIRTUAL_KEYBOARD_CONTAINER_LAYOUT_MANAGER_H_
#endif // ASH_KEYBOARD_VIRTUAL_KEYBOARD_CONTAINER_LAYOUT_MANAGER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ash/virtual_keyboard_controller.h"
#include "ash/keyboard/virtual_keyboard_controller.h"
#include <vector>
......
......@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#ifndef ASH_VIRTUAL_KEYBOARD_CONTROLLER_H_
#define ASH_VIRTUAL_KEYBOARD_CONTROLLER_H_
#ifndef ASH_KEYBOARD_VIRTUAL_KEYBOARD_CONTROLLER_H_
#define ASH_KEYBOARD_VIRTUAL_KEYBOARD_CONTROLLER_H_
#include <stdint.h>
......@@ -88,4 +88,4 @@ class ASH_EXPORT VirtualKeyboardController
} // namespace ash
#endif // ASH_VIRTUAL_KEYBOARD_CONTROLLER_H_
#endif // ASH_KEYBOARD_VIRTUAL_KEYBOARD_CONTROLLER_H_
......@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ash/virtual_keyboard_controller.h"
#include "ash/keyboard/virtual_keyboard_controller.h"
#include <utility>
#include <vector>
......
......@@ -15,6 +15,7 @@
#include "ash/focus_cycler.h"
#include "ash/high_contrast/high_contrast_controller.h"
#include "ash/host/ash_window_tree_host.h"
#include "ash/keyboard/virtual_keyboard_container_layout_manager.h"
#include "ash/lock_screen_action/lock_screen_action_background_controller.h"
#include "ash/login_status.h"
#include "ash/public/cpp/ash_constants.h"
......@@ -39,7 +40,6 @@
#include "ash/touch/touch_hud_debug.h"
#include "ash/touch/touch_hud_projection.h"
#include "ash/touch/touch_observer_hud.h"
#include "ash/virtual_keyboard_container_layout_manager.h"
#include "ash/wallpaper/wallpaper_widget_controller.h"
#include "ash/wm/always_on_top_controller.h"
#include "ash/wm/container_finder.h"
......
......@@ -56,6 +56,7 @@
#include "ash/ime/ime_controller.h"
#include "ash/ime/ime_focus_handler.h"
#include "ash/keyboard/keyboard_ui.h"
#include "ash/keyboard/virtual_keyboard_controller.h"
#include "ash/laser/laser_pointer_controller.h"
#include "ash/login/login_screen_controller.h"
#include "ash/login_status.h"
......@@ -125,7 +126,6 @@
#include "ash/touch/touch_devices_controller.h"
#include "ash/tray_action/tray_action.h"
#include "ash/utility/screenshot_controller.h"
#include "ash/virtual_keyboard_controller.h"
#include "ash/voice_interaction/voice_interaction_controller.h"
#include "ash/wallpaper/wallpaper_controller.h"
#include "ash/wayland/wayland_server_controller.h"
......
......@@ -11,11 +11,11 @@
#include "ash/host/ash_window_tree_host.h"
#include "ash/host/ash_window_tree_host_init_params.h"
#include "ash/keyboard/keyboard_ui.h"
#include "ash/keyboard/virtual_keyboard_controller.h"
#include "ash/pointer_watcher_adapter_classic.h"
#include "ash/public/cpp/config.h"
#include "ash/public/cpp/immersive/immersive_fullscreen_controller.h"
#include "ash/shell.h"
#include "ash/virtual_keyboard_controller.h"
#include "ash/wm/drag_window_resizer.h"
#include "ash/wm/mru_window_tracker.h"
#include "ash/wm/overview/window_selector_controller.h"
......
......@@ -6,6 +6,7 @@
#include "ash/accessibility/accessibility_controller.h"
#include "ash/ime/ime_controller.h"
#include "ash/keyboard/virtual_keyboard_controller.h"
#include "ash/public/cpp/ash_constants.h"
#include "ash/root_window_controller.h"
#include "ash/session/session_controller.h"
......@@ -22,7 +23,6 @@
#include "ash/system/tray/tray_popup_item_style.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "ash/system/tray/tray_utils.h"
#include "ash/virtual_keyboard_controller.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/user_metrics.h"
#include "base/strings/utf_string_conversions.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment