Commit 97aac7d2 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

SplitSettings: Move CrOS only a11y subpages to c/b/r/chromeos/

Specifically moving:
 - manage_a11y_page
 - switch_access_subpage
 - tts_subpage

These subpages are no longer used anywhere other than OS Settings.

Bug: 1026455
Change-Id: I1f22f73ea66158e100a98407ce6850ebccd9f5b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1972620
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726185}
parent 5a7d5a43
...@@ -10,15 +10,6 @@ js_type_check("closure_compile") { ...@@ -10,15 +10,6 @@ js_type_check("closure_compile") {
":captions_browser_proxy", ":captions_browser_proxy",
":captions_subpage", ":captions_subpage",
] ]
if (is_chromeos) {
deps += [
":externs",
":manage_a11y_page",
":switch_access_subpage",
":tts_subpage",
]
}
} }
js_library("captions_subpage") { js_library("captions_subpage") {
...@@ -40,45 +31,6 @@ js_library("a11y_page") { ...@@ -40,45 +31,6 @@ js_library("a11y_page") {
] ]
} }
js_library("manage_a11y_page") {
deps = [
"..:route",
"..:route_origin_behavior",
"../chromeos/localized_link:localized_link",
"../device_page:device_page_browser_proxy",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
externs_list = [ "$externs_path/settings_private.js" ]
}
js_library("switch_access_subpage") {
deps = [
"..:route",
"../prefs:prefs_behavior",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
externs_list = [ "$externs_path/settings_private.js" ]
}
js_library("tts_subpage") {
deps = [
":externs",
"..:route",
"../controls:settings_slider",
"../languages_page:languages_browser_proxy",
"../settings_page:settings_animated_pages",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
}
js_library("externs") {
}
js_library("captions_browser_proxy") { js_library("captions_browser_proxy") {
deps = [ deps = [
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
......
...@@ -6,12 +6,12 @@ import("//third_party/closure_compiler/compile_js.gni") ...@@ -6,12 +6,12 @@ import("//third_party/closure_compiler/compile_js.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ deps = [
":externs",
":manage_a11y_page",
":os_a11y_page", ":os_a11y_page",
":switch_access_subpage",
":tts_subpage",
"../../a11y_page:captions_subpage", "../../a11y_page:captions_subpage",
"../../a11y_page:externs",
"../../a11y_page:manage_a11y_page",
"../../a11y_page:switch_access_subpage",
"../../a11y_page:tts_subpage",
"../../appearance_page:fonts_browser_proxy", "../../appearance_page:fonts_browser_proxy",
] ]
} }
...@@ -24,3 +24,41 @@ js_library("os_a11y_page") { ...@@ -24,3 +24,41 @@ js_library("os_a11y_page") {
"//ui/webui/resources/js:web_ui_listener_behavior", "//ui/webui/resources/js:web_ui_listener_behavior",
] ]
} }
js_library("manage_a11y_page") {
deps = [
"../..:route",
"../..:route_origin_behavior",
"../../device_page:device_page_browser_proxy",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
externs_list = [ "$externs_path/settings_private.js" ]
}
js_library("switch_access_subpage") {
deps = [
"../..:route",
"../../prefs:prefs_behavior",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
externs_list = [ "$externs_path/settings_private.js" ]
}
js_library("tts_subpage") {
deps = [
":externs",
"../..:route",
"../../controls:settings_slider",
"../../languages_page:languages_browser_proxy",
"../../settings_page:settings_animated_pages",
"//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
}
js_library("externs") {
}
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
<link rel="import" href="chrome://resources/cr_elements/icons.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/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="../controls/settings_slider.html"> <link rel="import" href="../../controls/settings_slider.html">
<link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../../controls/settings_toggle_button.html">
<link rel="import" href="../device_page/device_page_browser_proxy.html"> <link rel="import" href="../../device_page/device_page_browser_proxy.html">
<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../../i18n_setup.html">
<link rel="import" href="../route.html"> <link rel="import" href="../../route.html">
<link rel="import" href="../route_origin_behavior.html"> <link rel="import" href="../../route_origin_behavior.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../chromeos/localized_link/localized_link.html"> <link rel="import" href="../localized_link/localized_link.html">
<dom-module id="settings-manage-a11y-page"> <dom-module id="settings-manage-a11y-page">
<template> <template>
......
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
<link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html"> <link rel="import" href="chrome://resources/cr_elements/cr_link_row/cr_link_row.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="../../i18n_setup.html"> <link rel="import" href="../../a11y_page/captions_subpage.html">
<link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../../a11y_page/manage_a11y_page.html">
<link rel="import" href="../../controls/settings_toggle_button.html"> <link rel="import" href="../../controls/settings_toggle_button.html">
<link rel="import" href="../../i18n_setup.html">
<link rel="import" href="../../settings_page/settings_animated_pages.html"> <link rel="import" href="../../settings_page/settings_animated_pages.html">
<link rel="import" href="../../settings_page/settings_subpage.html"> <link rel="import" href="../../settings_page/settings_subpage.html">
<link rel="import" href="../../a11y_page/captions_subpage.html"> <link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../../a11y_page/switch_access_subpage.html"> <link rel="import" href="manage_a11y_page.html">
<link rel="import" href="../../a11y_page/tts_subpage.html"> <link rel="import" href="switch_access_subpage.html">
<link rel="import" href="tts_subpage.html">
<dom-module id="os-settings-a11y-page"> <dom-module id="os-settings-a11y-page">
<template> <template>
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/md_select_css.html"> <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
<link rel="import" href="../controls/settings_dropdown_menu.html"> <link rel="import" href="../../controls/settings_dropdown_menu.html">
<link rel="import" href="../controls/settings_slider.html"> <link rel="import" href="../../controls/settings_slider.html">
<link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../../controls/settings_toggle_button.html">
<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../../i18n_setup.html">
<link rel="import" href="../prefs/prefs_behavior.html"> <link rel="import" href="../../prefs/prefs_behavior.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-switch-access-subpage"> <dom-module id="settings-switch-access-subpage">
<template> <template>
......
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/md_select_css.html"> <link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
<link rel="import" href="../controls/settings_slider.html"> <link rel="import" href="../../controls/settings_slider.html">
<link rel="import" href="../i18n_setup.html"> <link rel="import" href="../../i18n_setup.html">
<link rel="import" href="../languages_page/languages_browser_proxy.html"> <link rel="import" href="../../languages_page/languages_browser_proxy.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-tts-subpage"> <dom-module id="settings-tts-subpage">
<template> <template>
......
...@@ -179,22 +179,22 @@ ...@@ -179,22 +179,22 @@
file="appearance_page/fonts_browser_proxy.js" file="appearance_page/fonts_browser_proxy.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_JS" <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_JS"
file="a11y_page/manage_a11y_page.js" file="chromeos/os_a11y_page/manage_a11y_page.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_HTML" <structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_HTML"
file="a11y_page/manage_a11y_page.html" file="chromeos/os_a11y_page/manage_a11y_page.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDS_OS_SETTINGS_SWITCH_ACCESS_SUBPAGE_JS" <structure name="IDS_OS_SETTINGS_SWITCH_ACCESS_SUBPAGE_JS"
file="a11y_page/switch_access_subpage.js" file="chromeos/os_a11y_page/switch_access_subpage.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_SWITCH_ACCESS_SUBPAGE_HTML" <structure name="IDR_OS_SETTINGS_SWITCH_ACCESS_SUBPAGE_HTML"
file="a11y_page/switch_access_subpage.html" file="chromeos/os_a11y_page/switch_access_subpage.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_JS" <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_JS"
file="a11y_page/tts_subpage.js" file="chromeos/os_a11y_page/tts_subpage.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_HTML" <structure name="IDR_OS_SETTINGS_TTS_SUBPAGE_HTML"
file="a11y_page/tts_subpage.html" file="chromeos/os_a11y_page/tts_subpage.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_MANIFEST" <structure name="IDR_OS_SETTINGS_MANIFEST"
file="os_settings_manifest.json" file="os_settings_manifest.json"
......
...@@ -1103,7 +1103,7 @@ var OSSettingsManageAccessibilityPageTest = ...@@ -1103,7 +1103,7 @@ var OSSettingsManageAccessibilityPageTest =
class extends OSSettingsBrowserTest { class extends OSSettingsBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return super.browsePreload + 'a11y_page/manage_a11y_page.html'; return super.browsePreload + 'chromeos/os_a11y_page/manage_a11y_page.html';
} }
/** @override */ /** @override */
......
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