Move shortcut viewer to ash/

Next step:
* Consolidate string grd file into single shortcut_viewer_strings.grd
* Remove NewWindowDelegate::ShowKeyboardShortcutViewer
  and open it directly.
* Remove KSV_EXPORT

Bug: 1046624

Change-Id: I4241bd00d5c27520ac11c09e7264e8c8c9729a84
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2065852
Commit-Queue: Mitsuru Oshima (OOO) <oshima@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743191}

ash/BUILD.gn

@@ -1635,8 +1635,8 @@ static_library("ash_shell_lib_with_content") {
 
   deps = [
     ":test_support",
-    "//ash/components/shortcut_viewer",
     "//ash/public/cpp",
+    "//ash/shortcut_viewer",
     "//base:i18n",
     "//chrome:packed_resources",
 
@@ -2070,7 +2070,6 @@ test("ash_unittests") {
     "//ash/assistant/ui",
     "//ash/assistant/ui:constants",
     "//ash/assistant/util",
-    "//ash/components/shortcut_viewer:unit_tests",
     "//ash/keyboard/arc",
     "//ash/keyboard/ui",
     "//ash/keyboard/ui:test_support",
@@ -2079,6 +2078,7 @@ test("ash_unittests") {
     "//ash/public/cpp:unit_tests",
     "//ash/public/cpp/vector_icons",
     "//ash/resources/vector_icons",
+    "//ash/shortcut_viewer:unit_tests",
     "//ash/strings",
     "//ash/system/machine_learning:user_settings_event_proto",
     "//ash/system/message_center/arc",
@@ -2265,7 +2265,7 @@ static_library("test_support") {
   testonly = true
   friend = [
     ":*",
-    "//ash/components/shortcut_viewer:*",
+    "//ash/shortcut_viewer:*",
     "//components/exo:*",
     "//components/exo/wayland:*",
   ]

ash/components/DEPS

-# Components must declare all dependencies explicitly. They do not inherit
-# from //ash/DEPS.
-noparent = True
-
-include_rules = [
-  # Components can use some common things.
-  "+base",
-  "+build",
-  "+testing",
-
-  # Components can be mojo services.
-  "+mojo/public",
-
-  # Components support views UI with aura.
-  "+cc/paint",
-  "+ui/aura",
-  "+ui/base",
-  "+ui/display",
-  "+ui/events",
-  "+ui/gfx",
-  "+ui/views",
-
-  # Components may directly access ash.
-  "+ash",
-
-  # Individual components must explicitly declare their dependencies
-  # on other components. Cycles in the dependency graph within
-  # components/ are not allowed.
-  "-ash/components",
-
-  # Components sit below chrome.
-  "-chrome",
-]

ash/components/OWNERS

-# grdp files
-per-file shortcut_viewer_strings.grdp=file://ash/components/shortcut_viewer/OWNERS

ash/components/README.md

-//ash/components
-----------------
-This directory is for medium-sized UI "components" or "modules" or "mini-apps"
-that run on Chrome OS. In the long term, some of these mini-apps may become
-their own mojo applications and run independently, instead of as part of the
-browser or as part of ash.
-
-Generally these mini-apps depend on //base, //chromeos, //ui and low-level
-components like //components/prefs.
-
-Code here should not depend on //ash, except for the public mojo IPC interfaces
-in //ash/public. Likewise, //ash should not depend on these components, except
-for possibly for a header that allows launching the mini-app.
-
-If the mini-app contains webui it might depend on //content, but in general
-//content dependencies should be avoided.
-
-Code in //ash/components/foo should be in "namespace foo" not "namespace ash".
-
-//ash is only used on Chrome OS. If a component is used on other platforms the
-code should move to //components.

ash/components/shortcut_viewer/DEPS

-include_rules = [
-  "+ash/components/strings",
-  "+ui/accessibility",
-  "+ui/chromeos/events",
-  "+ui/chromeos/search_box",
-]
-
-specific_include_rules = {
-  "keyboard_shortcut_view_unittest\.cc": [
-    "+ash/shell.h",
-    "+ash/test/ash_test_base.h",
-    "+ui/compositor",
-  ],
-}

ash/components/shortcut_viewer/BUILD.gn → ash/shortcut_viewer/BUILD.gn

@@ -26,10 +26,10 @@ source_set("shortcut_viewer") {
 
   deps = [
     "//ash",
-    "//ash/components/shortcut_viewer/vector_icons",
-    "//ash/components/strings",
     "//ash/public/cpp",
     "//ash/public/cpp/resources:ash_public_unscaled_resources",
+    "//ash/shortcut_viewer/strings",
+    "//ash/shortcut_viewer/vector_icons",
     "//cc/paint",
     "//ui/accessibility",
     "//ui/aura",

ash/components/shortcut_viewer/keyboard_shortcut_item.cc → ash/shortcut_viewer/keyboard_shortcut_item.cc

@@ -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/components/shortcut_viewer/keyboard_shortcut_item.h"
+#include "ash/shortcut_viewer/keyboard_shortcut_item.h"
 
 #include <tuple>
 

ash/components/shortcut_viewer/keyboard_shortcut_item.h → ash/shortcut_viewer/keyboard_shortcut_item.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_COMPONENTS_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_ITEM_H_
-#define ASH_COMPONENTS_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_ITEM_H_
+#ifndef ASH_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_ITEM_H_
+#define ASH_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_ITEM_H_
 
 #include <vector>
 
-#include "ash/components/shortcut_viewer/ksv_export.h"
+#include "ash/shortcut_viewer/ksv_export.h"
 #include "base/macros.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
@@ -103,4 +103,4 @@ struct KSV_EXPORT KeyboardShortcutItem {
 
 }  // namespace keyboard_shortcut_viewer
 
-#endif  // ASH_COMPONENTS_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_ITEM_H_
+#endif  // ASH_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_ITEM_H_

ash/components/shortcut_viewer/keyboard_shortcut_viewer_metadata.cc → ash/shortcut_viewer/keyboard_shortcut_viewer_metadata.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/components/shortcut_viewer/keyboard_shortcut_viewer_metadata.h"
+#include "ash/shortcut_viewer/keyboard_shortcut_viewer_metadata.h"
 
-#include "ash/components/shortcut_viewer/keyboard_shortcut_item.h"
-#include "ash/components/shortcut_viewer/vector_icons/vector_icons.h"
-#include "ash/components/strings/grit/ash_components_strings.h"
+#include "ash/shortcut_viewer/keyboard_shortcut_item.h"
+#include "ash/shortcut_viewer/strings/grit/ash_components_strings.h"
+#include "ash/shortcut_viewer/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/no_destructor.h"

ash/components/shortcut_viewer/keyboard_shortcut_viewer_metadata.h → ash/shortcut_viewer/keyboard_shortcut_viewer_metadata.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_COMPONENTS_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_VIEWER_METADATA_H_
-#define ASH_COMPONENTS_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_VIEWER_METADATA_H_
+#ifndef ASH_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_VIEWER_METADATA_H_
+#define ASH_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_VIEWER_METADATA_H_
 
 #include <vector>
 
-#include "ash/components/shortcut_viewer/ksv_export.h"
+#include "ash/shortcut_viewer/ksv_export.h"
 #include "base/containers/span.h"
 #include "base/optional.h"
 #include "base/strings/string16.h"
@@ -48,4 +48,4 @@ const gfx::VectorIcon* GetVectorIconForKeyboardCode(ui::KeyboardCode key_code);
 
 }  // namespace keyboard_shortcut_viewer
 
-#endif  // ASH_COMPONENTS_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_VIEWER_METADATA_H_
+#endif  // ASH_SHORTCUT_VIEWER_KEYBOARD_SHORTCUT_VIEWER_METADATA_H_

ash/components/shortcut_viewer/ksv_export.h → ash/shortcut_viewer/ksv_export.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_COMPONENTS_SHORTCUT_VIEWER_KSV_EXPORT_H_
-#define ASH_COMPONENTS_SHORTCUT_VIEWER_KSV_EXPORT_H_
+#ifndef ASH_SHORTCUT_VIEWER_KSV_EXPORT_H_
+#define ASH_SHORTCUT_VIEWER_KSV_EXPORT_H_
 
 // Defines KSV_EXPORT so that functionality implemented by
 // the keyboard shortcut viewer module can be exported to consumers.
@@ -20,4 +20,4 @@
 #define KSV_EXPORT
 #endif
 
-#endif  // ASH_COMPONENTS_SHORTCUT_VIEWER_KSV_EXPORT_H_
+#endif  // ASH_SHORTCUT_VIEWER_KSV_EXPORT_H_