WebUI: Move FindShortcutBehavior to cr_elements/

There are a couple of Polymer Behaviors currently defined in the
ui/webui/resources/html/* and ui/webui/resources/js/* folders. Since
Polymer Behaviors can only be used in Polymer elements, makes more
sense to define them in cr_elements/ along with other such behaviors.

Moreover this simplifies the testing code by being able to leverage
cr_elements_browsertest.js.

Bug: 1133385
Change-Id: I66eb64812ae4c502452971da003b7a84f5f9d3fa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2435820Reviewed-by: Esmael Elmoslimany <aee@chromium.org>
Commit-Queue: dpapad <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#811835}

chrome/browser/resources/bookmarks/BUILD.gn

@@ -142,8 +142,8 @@ js_library("app") {
     ":store",
     ":store_client",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_splitter:cr_splitter",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
   ]
   externs_list = [

chrome/browser/resources/bookmarks/app.js

@@ -14,7 +14,7 @@ import './shared_vars.js';
 import './strings.m.js';
 import './toolbar.js';
 
-import {FindShortcutBehavior} from 'chrome://resources/js/find_shortcut_behavior.m.js';
+import {FindShortcutBehavior} from 'chrome://resources/cr_elements/find_shortcut_behavior.m.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 

chrome/browser/resources/downloads/BUILD.gn

@@ -117,9 +117,9 @@ js_library("manager") {
     ":toolbar",
     "//third_party/polymer/v3_0/components-chromium/iron-a11y-announcer",
     "//third_party/polymer/v3_0/components-chromium/iron-list",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_toast:cr_toast_manager.m",
     "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:promise_resolver.m",
     "//ui/webui/resources/js:util.m",

chrome/browser/resources/downloads/manager.js

@@ -14,8 +14,8 @@ import 'chrome://resources/cr_elements/shared_vars_css.m.js';
 import 'chrome://resources/polymer/v3_0/iron-list/iron-list.js';
 
 import {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js';
+import {FindShortcutBehavior} from 'chrome://resources/cr_elements/find_shortcut_behavior.m.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {FindShortcutBehavior} from 'chrome://resources/js/find_shortcut_behavior.m.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {PromiseResolver} from 'chrome://resources/js/promise_resolver.m.js';
 import {queryRequiredElement} from 'chrome://resources/js/util.m.js';

chrome/browser/resources/history/BUILD.gn

@@ -152,9 +152,9 @@ js_library("app") {
     ":synced_device_card",
     ":synced_device_manager",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer.m",
     "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:web_ui_listener_behavior.m",
   ]
 }

chrome/browser/resources/history/app.js

@@ -6,7 +6,7 @@ import {Polymer, html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bun
 import 'chrome://resources/cr_elements/shared_style_css.m.js';
 import 'chrome://resources/cr_elements/shared_vars_css.m.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
-import {FindShortcutBehavior} from 'chrome://resources/js/find_shortcut_behavior.m.js';
+import {FindShortcutBehavior} from 'chrome://resources/cr_elements/find_shortcut_behavior.m.js';
 import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
 import {WebUIListenerBehavior} from 'chrome://resources/js/web_ui_listener_behavior.m.js';
 import 'chrome://resources/polymer/v3_0/iron-media-query/iron-media-query.js';

chrome/browser/resources/settings/chromeos/os_languages_page/BUILD.gn

@@ -154,8 +154,8 @@ js_library("os_add_languages_dialog") {
   deps = [
     "../../languages_page:languages",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
-    "//ui/webui/resources/js:find_shortcut_behavior",
   ]
 }
 
@@ -260,8 +260,8 @@ js_library("os_add_languages_dialog.m") {
     "../../languages_page:languages.m",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
   ]
   extra_deps = [ ":os_add_languages_dialog_module" ]
 }

chrome/browser/resources/settings/chromeos/os_languages_page/os_add_languages_dialog.html

@@ -5,8 +5,8 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_search_field/cr_search_field.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
+<link rel="import" href="chrome://resources/cr_elements/find_shortcut_behavior.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
-<link rel="import" href="chrome://resources/html/find_shortcut_behavior.html">
 <link rel="import" href="chrome://resources/html/load_time_data.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
 <link rel="import" href="shared_style.html">

chrome/browser/resources/settings/chromeos/os_settings_ui/BUILD.gn

@@ -19,10 +19,10 @@ js_library("os_settings_ui") {
     "../os_settings_main:os_settings_main",
     "../os_toolbar",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior",
     "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer",
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
-    "//ui/webui/resources/js:find_shortcut_behavior",
   ]
 }
 

chrome/browser/resources/settings/chromeos/os_settings_ui/os_settings_ui.html

@@ -5,7 +5,7 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_page_host_style_css.html">
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
-<link rel="import" href="chrome://resources/html/find_shortcut_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/find_shortcut_behavior.html">
 <link rel="import" href="chrome://resources/html/util.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html">
 <link rel="import" href="../metrics_recorder.html">

chrome/browser/resources/settings/languages_page/BUILD.gn

@@ -73,8 +73,8 @@ js_library("add_languages_dialog") {
     ":languages_types",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_scrollable_behavior.m",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
   ]
 }
 

chrome/browser/resources/settings/languages_page/add_languages_dialog.js

@@ -16,7 +16,7 @@ import './languages.m.js';
 import '../settings_shared_css.m.js';
 
 import {CrScrollableBehavior} from 'chrome://resources/cr_elements/cr_scrollable_behavior.m.js';
-import {FindShortcutBehavior} from 'chrome://resources/js/find_shortcut_behavior.m.js';
+import {FindShortcutBehavior} from 'chrome://resources/cr_elements/find_shortcut_behavior.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 
 Polymer({

chrome/browser/resources/settings/settings_page/BUILD.gn

@@ -34,9 +34,9 @@ js_library("settings_subpage") {
     "..:router",
     "..:setting_id_param_util",
     "//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field",
     "//ui/webui/resources/js:assert",
-    "//ui/webui/resources/js:find_shortcut_behavior",
     "//ui/webui/resources/js:i18n_behavior",
     "//ui/webui/resources/js:load_time_data",
     "//ui/webui/resources/js:util",
@@ -94,9 +94,9 @@ js_library("settings_subpage.m") {
     "..:setting_id_param_util.m",
     "//third_party/polymer/v3_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_search_field:cr_search_field.m",
     "//ui/webui/resources/js:assert.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:i18n_behavior.m",
     "//ui/webui/resources/js:load_time_data.m",
     "//ui/webui/resources/js:util.m",

chrome/browser/resources/settings/settings_page/settings_subpage.html

@@ -6,7 +6,7 @@
 <link rel="import" href="chrome://resources/cr_elements/icons.html">
 <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
 <link rel="import" href="chrome://resources/html/assert.html">
-<link rel="import" href="chrome://resources/html/find_shortcut_behavior.html">
+<link rel="import" href="chrome://resources/cr_elements/find_shortcut_behavior.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/util.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">

chrome/browser/resources/settings/settings_ui/BUILD.gn

@@ -24,13 +24,13 @@ js_library("settings_ui") {
     "../settings_menu:settings_menu",
     "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
     "//ui/webui/resources/cr_elements:cr_container_shadow_behavior.m",
+    "//ui/webui/resources/cr_elements:find_shortcut_behavior.m",
     "//ui/webui/resources/cr_elements/cr_drawer:cr_drawer.m",
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar.m",
     "//ui/webui/resources/cr_elements/cr_toolbar:cr_toolbar_search_field.m",
     "//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior.m",
     "//ui/webui/resources/js:assert.m",
     "//ui/webui/resources/js:cr.m",
-    "//ui/webui/resources/js:find_shortcut_behavior.m",
     "//ui/webui/resources/js:util.m",
   ]
 }

chrome/browser/resources/settings/settings_ui/settings_ui.js

@@ -24,9 +24,9 @@ import '../prefs/prefs.m.js';
 import '../settings_vars_css.m.js';
 
 import {CrContainerShadowBehavior} from 'chrome://resources/cr_elements/cr_container_shadow_behavior.m.js';
+import {FindShortcutBehavior} from 'chrome://resources/cr_elements/find_shortcut_behavior.m.js';
 import {assert} from 'chrome://resources/js/assert.m.js';
 import {isChromeOS} from 'chrome://resources/js/cr.m.js';
-import {FindShortcutBehavior} from 'chrome://resources/js/find_shortcut_behavior.m.js';
 import {listenOnce} from 'chrome://resources/js/util.m.js';
 import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 

chrome/test/data/webui/BUILD.gn

@@ -82,8 +82,6 @@ if (include_js_tests) {
       "cr_components/cr_components_v3_browsertest.js",
       "cr_elements/cr_elements_browsertest.js",
       "cr_elements/cr_elements_v3_browsertest.js",
-      "find_shortcut_behavior_browsertest.js",
-      "find_shortcut_behavior_v3_browsertest.js",
       "histograms/histograms_internals_ui_browsertest.js",
       "history/history_browsertest.js",
       "js/webui_resource_module_async_browsertest.js",
@@ -218,8 +216,8 @@ if (include_js_tests) {
       "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toast_test.m.js",
       "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_toolbar_tests.m.js",
       "$root_gen_dir/chrome/test/data/webui/cr_elements/cr_view_manager_test.m.js",
+      "$root_gen_dir/chrome/test/data/webui/cr_elements/find_shortcut_behavior_test.m.js",
       "$root_gen_dir/chrome/test/data/webui/fake_chrome_event.m.js",
-      "$root_gen_dir/chrome/test/data/webui/find_shortcut_behavior_test.m.js",
       "$root_gen_dir/chrome/test/data/webui/mock_controller.m.js",
       "$root_gen_dir/chrome/test/data/webui/mock_timer.m.js",
       "$root_gen_dir/chrome/test/data/webui/resources/list_property_update_behavior_tests.m.js",
@@ -448,7 +446,6 @@ js_modulizer("modulize_local") {
   input_files = [
     "cr_focus_row_behavior_test.js",
     "fake_chrome_event.js",
-    "find_shortcut_behavior_test.js",
     "mock_controller.js",
     "mock_timer.js",
     "test_browser_proxy.js",

chrome/test/data/webui/cr_elements/BUILD.gn

@@ -39,6 +39,7 @@ js_modulizer("modulize") {
     "cr_toast_manager_test.js",
     "cr_toggle_test.js",
     "cr_view_manager_test.js",
+    "find_shortcut_behavior_test.js",
     "iron_list_focus_test.js",
   ]
   namespace_rewrites = test_namespace_rewrites + [ "Polymer.Base|Base" ]

chrome/test/data/webui/cr_elements/cr_elements_browsertest.js

@@ -543,6 +543,33 @@ TEST_F('CrElementsExpandButtonTest', 'All', function() {
   mocha.run();
 });
 
+/**
+ * @constructor
+ * @extends {CrElementsBrowserTest}
+ */
+function CrElementsFindShortcutBehaviorTest() {}
+
+CrElementsFindShortcutBehaviorTest.prototype = {
+  __proto__: CrElementsBrowserTest.prototype,
+
+  /**
+   * Preload a module that depends on both cr-dialog and FindShortcutBehavior.
+   * cr-dialog is used in the tests.
+   * @override
+   */
+  browsePreload: 'chrome://resources/cr_elements/find_shortcut_behavior.html',
+
+  /** @override */
+  extraLibraries: CrElementsBrowserTest.prototype.extraLibraries.concat([
+    '../test_util.js',
+    'find_shortcut_behavior_test.js',
+  ]),
+};
+
+TEST_F('CrElementsFindShortcutBehaviorTest', 'All', function() {
+  mocha.run();
+});
+
 GEN('#if defined(OS_CHROMEOS)');
 /**
  * @constructor

chrome/test/data/webui/cr_elements/cr_elements_v3_browsertest.js

@@ -101,6 +101,19 @@ TEST_F('CrElementsExpandButtonV3Test', 'All', function() {
   mocha.run();
 });
 
+// eslint-disable-next-line no-var
+var CrElementsFindShortcutBehaviorV3Test =
+    class extends CrElementsV3BrowserTest {
+  /** @override */
+  get browsePreload() {
+    return 'chrome://test?module=cr_elements/find_shortcut_behavior_test.m.js';
+  }
+};
+
+TEST_F('CrElementsFindShortcutBehaviorV3Test', 'All', function() {
+  mocha.run();
+});
+
 // eslint-disable-next-line no-var
 var CrElementsFingerprintProgressArcV3Test =
     class extends CrElementsV3BrowserTest {

chrome/test/data/webui/find_shortcut_behavior_test.js → chrome/test/data/webui/cr_elements/find_shortcut_behavior_test.js

@@ -6,7 +6,7 @@
 // #import 'chrome://resources/cr_elements/cr_dialog/cr_dialog.m.js';
 // #import {assert} from 'chrome://resources/js/assert.m.js';
 // #import {eventToPromise} from 'chrome://test/test_util.m.js';
-// #import {FindShortcutBehavior, FindShortcutManager} from 'chrome://resources/js/find_shortcut_behavior.m.js';
+// #import {FindShortcutBehavior, FindShortcutManager} from 'chrome://resources/cr_elements/find_shortcut_behavior.m.js';
 // #import {isMac} from 'chrome://resources/js/cr.m.js';
 // #import {Polymer, html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js';
 // #import {pressAndReleaseKeyOn} from 'chrome://resources/polymer/v3_0/iron-test-helpers/mock-interactions.js';

chrome/test/data/webui/find_shortcut_behavior_browsertest.js

-// Copyright 2018 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Polymer BrowserTest fixture.
-GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
-
-GEN('#include "content/public/test/browser_test.h"');
-
-/**
- * Test fixture for FindShortcutBehavior.
- * @constructor
- * @extends {PolymerTest}
- */
-function FindShortcutBehaviorTest() {}
-
-FindShortcutBehaviorTest.prototype = {
-  __proto__: PolymerTest.prototype,
-
-  /**
-   * Preload a module that depends on both cr-dialog and FindShortcutBehavior.
-   * cr-dialog is used in the tests.
-   * @override
-   */
-  browsePreload: 'chrome://resources/html/find_shortcut_behavior.html',
-
-  /** @override */
-  extraLibraries: [
-    ...PolymerTest.prototype.extraLibraries,
-    '//ui/webui/resources/js/util.js',
-    'test_util.js',
-    'find_shortcut_behavior_test.js',
-  ],
-};
-
-TEST_F('FindShortcutBehaviorTest', 'All', function() {
-  mocha.run();
-});

chrome/test/data/webui/find_shortcut_behavior_v3_browsertest.js

-// Copyright 2019 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Polymer BrowserTest fixture.
-GEN_INCLUDE(['//chrome/test/data/webui/polymer_browser_test_base.js']);
-
-GEN('#include "content/public/test/browser_test.h"');
-
-/**
- * Test fixture for FindShortcutBehavior.
- * @constructor
- * @extends {PolymerTest}
- */
-var FindShortcutBehaviorV3Test = class extends PolymerTest {
-  /** @override */
-  get browsePreload() {
-    return 'chrome://test?module=find_shortcut_behavior_test.m.js';
-  }
-
-  /** @override */
-  get webuiHost() {
-    return 'dummyurl';
-  }
-
-  /** @override */
-  get extraLibraries() {
-    return [
-      '//third_party/mocha/mocha.js',
-      '//chrome/test/data/webui/mocha_adapter.js',
-    ];
-  }
-};
-
-TEST_F('FindShortcutBehaviorV3Test', 'All', function() {
-  mocha.run();
-});

tools/polymer/polymer.gni

@@ -9,11 +9,11 @@ common_auto_imports = [
   "third_party/polymer/v1_0/components-chromium/paper-behaviors/paper-ripple-behavior.html|PaperRippleBehavior",
   "ui/webui/resources/cr_elements/cr_scrollable_behavior.html|CrScrollableBehavior",
   "ui/webui/resources/cr_elements/cr_radio_button/cr_radio_button_behavior.html|CrRadioButtonBehavior",
+  "ui/webui/resources/cr_elements/find_shortcut_behavior.html|FindShortcutBehavior",
   "ui/webui/resources/cr_elements/policy/cr_policy_pref_behavior.html|CrPolicyPrefBehavior",
   "ui/webui/resources/html/cr/ui/focus_outline_manager.html|FocusOutlineManager",
   "ui/webui/resources/html/cr/ui/focus_row_behavior.html|FocusRowBehavior",
   "ui/webui/resources/html/cr/ui/focus_without_ink.html|focusWithoutInk",
-  "ui/webui/resources/html/find_shortcut_behavior.html|FindShortcutBehavior",
   "ui/webui/resources/html/i18n_behavior.html|I18nBehavior",
   "ui/webui/resources/html/list_property_update_behavior.html|ListPropertyUpdateBehavior",
   "ui/webui/resources/html/load_time_data.html|loadTimeData",

ui/webui/resources/BUILD.gn

@@ -121,12 +121,12 @@ preprocess_grit("preprocess_generated") {
       "cr_elements/cr_checkbox/cr_checkbox.m.js",
       "cr_elements/cr_button/cr_button.m.js",
       "cr_elements/cr_action_menu/cr_action_menu.m.js",
+      "cr_elements/find_shortcut_behavior.m.js",
       "cr_elements/policy/cr_policy_indicator_behavior.m.js",
       "cr_elements/policy/cr_policy_indicator.m.js",
       "cr_elements/policy/cr_policy_pref_behavior.m.js",
       "cr_elements/policy/cr_policy_pref_indicator.m.js",
       "cr_elements/policy/cr_tooltip_icon.m.js",
-      "js/find_shortcut_behavior.m.js",
       "js/i18n_behavior.m.js",
       "js/list_property_update_behavior.m.js",
       "js/search_highlight_utils.m.js",

ui/webui/resources/cr_elements/BUILD.gn

@@ -77,6 +77,7 @@ js_type_check("cr_elements_resources") {
   deps = [
     ":cr_container_shadow_behavior",
     ":cr_scrollable_behavior",
+    ":find_shortcut_behavior",
   ]
 }
 
@@ -88,6 +89,15 @@ js_library("cr_container_shadow_behavior") {
   deps = [ "//ui/webui/resources/js:assert" ]
 }
 
+js_library("find_shortcut_behavior") {
+  deps = [
+    "//ui/webui/resources/js:assert",
+    "//ui/webui/resources/js:cr",
+    "//ui/webui/resources/js:util",
+    "//ui/webui/resources/js/cr/ui:keyboard_shortcut_list",
+  ]
+}
+
 # Targets for auto-generating Polymer 3 JS Modules.
 
 polymer_modulizer("action_link_css") {
@@ -148,8 +158,8 @@ js_modulizer("modulize") {
   input_files = [
     "cr_container_shadow_behavior.js",
     "cr_scrollable_behavior.js",
+    "find_shortcut_behavior.js",
   ]
-  deps = []
 }
 
 group("polymer3_elements") {
@@ -207,6 +217,7 @@ js_type_check("cr_elements_module_resources") {
   deps = [
     ":cr_container_shadow_behavior.m",
     ":cr_scrollable_behavior.m",
+    ":find_shortcut_behavior.m",
   ]
 }
 
@@ -227,6 +238,19 @@ js_library("cr_scrollable_behavior.m") {
   extra_deps = [ ":modulize" ]
 }
 
+js_library("find_shortcut_behavior.m") {
+  sources = [
+    "$root_gen_dir/ui/webui/resources/cr_elements/find_shortcut_behavior.m.js",
+  ]
+  deps = [
+    "//ui/webui/resources/js:assert.m",
+    "//ui/webui/resources/js:cr.m",
+    "//ui/webui/resources/js:util.m",
+    "//ui/webui/resources/js/cr/ui:keyboard_shortcut_list.m",
+  ]
+  extra_deps = [ ":modulize" ]
+}
+
 html_to_js("web_components") {
   js_files = [
     "mwb_shared_style.js",

ui/webui/resources/html/find_shortcut_behavior.html → ui/webui/resources/cr_elements/find_shortcut_behavior.html

@@ -2,4 +2,4 @@
 <link rel="import" href="../html/cr.html">
 <link rel="import" href="../html/cr/ui/keyboard_shortcut_list.html">
 <link rel="import" href="../html/util.html">
-<script src="../js/find_shortcut_behavior.js"></script>
+<script src="find_shortcut_behavior.js"></script>

ui/webui/resources/js/find_shortcut_behavior.js → ui/webui/resources/cr_elements/find_shortcut_behavior.js

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// #import {assert, assertNotReached} from './assert.m.js';
-// #import {isMac} from './cr.m.js';
-// #import {isTextInputElement} from './util.m.js';
-// #import {KeyboardShortcutList} from './cr/ui/keyboard_shortcut_list.m.js';
+// #import {assert, assertNotReached} from '../js/assert.m.js';
+// #import {isMac} from '../js/cr.m.js';
+// #import {isTextInputElement} from '../js/util.m.js';
+// #import {KeyboardShortcutList} from '../js/cr/ui/keyboard_shortcut_list.m.js';
 
 /**
  * @fileoverview Listens for a find keyboard shortcut (i.e. Ctrl/Cmd+f or /)

ui/webui/resources/cr_elements_resources.grdp

@@ -301,4 +301,8 @@
   <structure name="IDR_CR_ELEMENTS_CR_TOAST_MANAGER_JS"
              file="cr_elements/cr_toast/cr_toast_manager.js"
              type="chrome_html" />
+  <structure name="IDR_CR_ELEMENTS_FIND_SHORTCUT_BEHAVIOR_HTML"
+             file="cr_elements/find_shortcut_behavior.html" type="chrome_html" />
+  <structure name="IDR_CR_ELEMENTS_FIND_SHORTCUT_BEHAVIOR_JS"
+             file="cr_elements/find_shortcut_behavior.js" type="chrome_html" />
 </grit-part>

ui/webui/resources/cr_elements_resources_v3.grdp

@@ -156,6 +156,9 @@
          file="${root_gen_dir}/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_selection_overlay.m.js"
          use_base_dir="false"
          type="BINDATA" />
+  <include name="IDR_CR_ELEMENTS_FIND_SHORTCUT_BEHAVIOR_M_JS"
+           file="${root_gen_dir}/ui/webui/resources/cr_elements/find_shortcut_behavior.m.js"
+           use_base_dir="false" type="BINDATA" />
   <include name="IDR_CR_ELEMENTS_POLICY_CR_TOOLTIP_ICON_M_JS"
          file="${root_gen_dir}/ui/webui/resources/cr_elements/policy/cr_tooltip_icon.m.js"
          use_base_dir="false"

ui/webui/resources/cr_polymer_resources.grdp

@@ -7,8 +7,6 @@
              file="html/cr/ui/focus_row_behavior.html" type="chrome_html" />
   <structure name="IDR_WEBUI_HTML_CR_UI_FOCUS_WITHOUT_INK"
              file="html/cr/ui/focus_without_ink.html" type="chrome_html" />
-  <structure name="IDR_WEBUI_HTML_FIND_SHORTCUT_BEHAVIOR"
-             file="html/find_shortcut_behavior.html" type="chrome_html" />
   <structure name="IDR_WEBUI_HTML_I18N_BEHAVIOR"
              file="html/i18n_behavior.html" type="chrome_html" />
   <structure name="IDR_WEBUI_HTML_LIST_PROPERTY_UPDATE_BEHAVIOR"
@@ -31,8 +29,6 @@
              file="js/cr/ui/focus_row_behavior.js" type="chrome_html" />
   <structure name="IDR_WEBUI_JS_CR_UI_FOCUS_WITHOUT_INK"
              file="js/cr/ui/focus_without_ink.js" type="chrome_html" />
-  <structure name="IDR_WEBUI_JS_FIND_SHORTCUT_BEHAVIOR"
-             file="js/find_shortcut_behavior.js" type="chrome_html" />
   <structure name="IDR_WEBUI_JS_LIST_PROPERTY_UPDATE_BEHAVIOR"
              file="js/list_property_update_behavior.js" type="chrome_html" />
   <structure name="IDR_WEBUI_JS_POLYMER_CONFIG"

ui/webui/resources/cr_polymer_resources_v3.grdp

@@ -3,9 +3,6 @@
   <include name="IDR_WEBUI_JS_CR_UI_FOCUS_ROW_BEHAVIOR_M_JS"
            file="${root_gen_dir}/ui/webui/resources/js/cr/ui/focus_row_behavior.m.js"
            use_base_dir="false" type="BINDATA" />
-  <include name="IDR_WEBUI_JS_FIND_SHORTCUT_BEHAVIOR_M_JS"
-           file="${root_gen_dir}/ui/webui/resources/js/find_shortcut_behavior.m.js"
-           use_base_dir="false" type="BINDATA" />
   <include name="IDR_WEBUI_JS_I18N_BEHAVIOR_M_JS"
            file="${root_gen_dir}/ui/webui/resources/js/i18n_behavior.m.js"
            use_base_dir="false" type="BINDATA"

ui/webui/resources/js/BUILD.gn

@@ -19,7 +19,6 @@ js_type_check("js_resources") {
     ":assert",
     ":cr",
     ":event_tracker",
-    ":find_shortcut_behavior",
     ":i18n_behavior",
     ":i18n_template_no_process",
     ":icon",
@@ -114,22 +113,12 @@ js_library("webui_resource_test") {
   externs_list = [ "dom_automation_controller.js" ]
 }
 
-js_library("find_shortcut_behavior") {
-  deps = [
-    ":assert",
-    ":cr",
-    ":util",
-    "cr/ui:keyboard_shortcut_list",
-  ]
-}
-
 # Targets for auto-generating and type-checking JS Modules
 
 js_modulizer("modulize") {
   input_files = [
     "assert.js",
     "event_tracker.js",
-    "find_shortcut_behavior.js",
     "icon.js",
     "i18n_behavior.js",
     "list_property_update_behavior.js",
@@ -142,7 +131,6 @@ js_modulizer("modulize") {
   ]
   namespace_rewrites = [
     "cr.search_highlight_utils.Range|Range",
-    "cr.ui.KeyboardShortcutList|KeyboardShortcutList",
     "Polymer.ArraySplice.calculateSplices|calculateSplices",
   ]
   deps = [ "cr:modulize" ]
@@ -161,7 +149,6 @@ js_type_check("js_resources_modules") {
     ":assert.m",
     ":cr.m",
     ":event_tracker.m",
-    ":find_shortcut_behavior.m",
     ":i18n_behavior.m",
     ":icon.m",
     ":list_property_update_behavior.m",
@@ -193,18 +180,6 @@ js_library("event_tracker.m") {
   extra_deps = [ ":modulize" ]
 }
 
-js_library("find_shortcut_behavior.m") {
-  sources =
-      [ "$root_gen_dir/ui/webui/resources/js/find_shortcut_behavior.m.js" ]
-  deps = [
-    ":assert.m",
-    ":cr.m",
-    ":util.m",
-    "cr/ui:keyboard_shortcut_list.m",
-  ]
-  extra_deps = [ ":modulize" ]
-}
-
 js_library("icon.m") {
   sources = [ "$root_gen_dir/ui/webui/resources/js/icon.m.js" ]
   deps = [ ":cr.m" ]

ui/webui/resources/tools/js_modulizer.gni

@@ -23,6 +23,7 @@ common_namespace_rewrites = [
   "cr.ui.FocusOutlineManager|FocusOutlineManager",
   "cr.ui.FocusRowBehavior|FocusRowBehavior",
   "cr.ui.focusWithoutInk|focusWithoutInk",
+  "cr.ui.KeyboardShortcutList|KeyboardShortcutList",
   "cr.ui.Store|Store",
   "Polymer.dom.flush|flush",
   "Polymer.IronA11yAnnouncer|IronA11yAnnouncer",