Commit 121d2c53 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

SplitSettings: Move device_page to c/b/r/chromeos/

This page is no longer used anywhere other than Chrome OS Settings.

Bug: 1026455
Change-Id: I033b7d8c1936349802a8dafb092ab74bae36d452
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1973354
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726214}
parent 2b053c86
...@@ -108,7 +108,6 @@ group("closure_compile") { ...@@ -108,7 +108,6 @@ group("closure_compile") {
deps += [ deps += [
"android_apps_page:closure_compile", "android_apps_page:closure_compile",
"chromeos:closure_compile", "chromeos:closure_compile",
"device_page:closure_compile",
"multidevice_page:closure_compile", "multidevice_page:closure_compile",
"parental_controls_page:closure_compile", "parental_controls_page:closure_compile",
] ]
......
...@@ -75,6 +75,7 @@ group("closure_compile") { ...@@ -75,6 +75,7 @@ group("closure_compile") {
"bluetooth_page:closure_compile", "bluetooth_page:closure_compile",
"crostini_page:closure_compile", "crostini_page:closure_compile",
"date_time_page:closure_compile", "date_time_page:closure_compile",
"device_page:closure_compile",
"google_assistant_page:closure_compile", "google_assistant_page:closure_compile",
"internet_page:closure_compile", "internet_page:closure_compile",
"localized_link:closure_compile", "localized_link:closure_compile",
......
...@@ -25,7 +25,7 @@ js_type_check("closure_compile") { ...@@ -25,7 +25,7 @@ js_type_check("closure_compile") {
js_library("device_page") { js_library("device_page") {
deps = [ deps = [
":device_page_browser_proxy", ":device_page_browser_proxy",
"..:route", "../..:route",
"//ui/webui/resources/js:i18n_behavior", "//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:web_ui_listener_behavior", "//ui/webui/resources/js:web_ui_listener_behavior",
] ]
...@@ -40,17 +40,17 @@ js_library("device_page_browser_proxy") { ...@@ -40,17 +40,17 @@ js_library("device_page_browser_proxy") {
js_library("pointers") { js_library("pointers") {
deps = [ deps = [
":device_page_browser_proxy", ":device_page_browser_proxy",
"../chromeos/localized_link:localized_link", "../../controls:settings_toggle_button",
"../controls:settings_toggle_button", "../localized_link:localized_link",
] ]
} }
js_library("keyboard") { js_library("keyboard") {
deps = [ deps = [
":device_page_browser_proxy", ":device_page_browser_proxy",
"..:route", "../..:route",
"../controls:settings_dropdown_menu", "../../controls:settings_dropdown_menu",
"../prefs:prefs_types", "../../prefs:prefs_types",
"//ui/webui/resources/js:assert", "//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
"//ui/webui/resources/js:load_time_data", "//ui/webui/resources/js:load_time_data",
...@@ -61,7 +61,7 @@ js_library("keyboard") { ...@@ -61,7 +61,7 @@ js_library("keyboard") {
js_library("stylus") { js_library("stylus") {
deps = [ deps = [
":device_page_browser_proxy", ":device_page_browser_proxy",
"../prefs:prefs_types", "../../prefs:prefs_types",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator", "//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
"//ui/webui/resources/js:load_time_data", "//ui/webui/resources/js:load_time_data",
...@@ -71,9 +71,9 @@ js_library("stylus") { ...@@ -71,9 +71,9 @@ js_library("stylus") {
js_library("display") { js_library("display") {
deps = [ deps = [
":display_layout", ":display_layout",
"../controls:settings_dropdown_menu", "../../controls:settings_dropdown_menu",
"../controls:settings_slider", "../../controls:settings_slider",
"../prefs:prefs_behavior", "../../prefs:prefs_behavior",
"//ui/webui/resources/js:assert", "//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
"//ui/webui/resources/js:i18n_behavior", "//ui/webui/resources/js:i18n_behavior",
...@@ -122,7 +122,7 @@ js_library("layout_behavior") { ...@@ -122,7 +122,7 @@ js_library("layout_behavior") {
js_library("night_light_slider") { js_library("night_light_slider") {
deps = [ deps = [
"../prefs:prefs_behavior", "../../prefs:prefs_behavior",
"//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted", "//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
"//third_party/polymer/v1_0/components-chromium/paper-behaviors:paper-ripple-behavior-extracted", "//third_party/polymer/v1_0/components-chromium/paper-behaviors:paper-ripple-behavior-extracted",
] ]
...@@ -131,8 +131,8 @@ js_library("night_light_slider") { ...@@ -131,8 +131,8 @@ js_library("night_light_slider") {
js_library("power") { js_library("power") {
deps = [ deps = [
":device_page_browser_proxy", ":device_page_browser_proxy",
"..:route", "../..:route",
"../prefs:prefs_types", "../../prefs:prefs_types",
"//ui/webui/resources/js:i18n_behavior", "//ui/webui/resources/js:i18n_behavior",
"//ui/webui/resources/js:web_ui_listener_behavior", "//ui/webui/resources/js:web_ui_listener_behavior",
] ]
...@@ -141,9 +141,9 @@ js_library("power") { ...@@ -141,9 +141,9 @@ js_library("power") {
js_library("storage") { js_library("storage") {
deps = [ deps = [
"..:route", "../..:route",
"..:route_origin_behavior", "../..:route_origin_behavior",
"../chromeos/localized_link:localized_link", "../localized_link:localized_link",
"//ui/webui/resources/js:assert", "//ui/webui/resources/js:assert",
"//ui/webui/resources/js:load_time_data", "//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior", "//ui/webui/resources/js:web_ui_listener_behavior",
......
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
<link rel="import" href="storage.html"> <link rel="import" href="storage.html">
<link rel="import" href="storage_external.html"> <link rel="import" href="storage_external.html">
<link rel="import" href="stylus.html"> <link rel="import" href="stylus.html">
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../../prefs/prefs.html">
<link rel="import" href="../route.html"> <link rel="import" href="../../route.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="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-device-page"> <dom-module id="settings-device-page">
<template> <template>
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
<link rel="import" href="display_layout.html"> <link rel="import" href="display_layout.html">
<link rel="import" href="display_overscan_dialog.html"> <link rel="import" href="display_overscan_dialog.html">
<link rel="import" href="night_light_slider.html"> <link rel="import" href="night_light_slider.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="../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">
<link rel="import" href="../settings_vars_css.html"> <link rel="import" href="../../settings_vars_css.html">
<dom-module id="settings-display"> <dom-module id="settings-display">
<template> <template>
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/shadow.html">
<link rel="import" href="drag_behavior.html"> <link rel="import" href="drag_behavior.html">
<link rel="import" href="layout_behavior.html"> <link rel="import" href="layout_behavior.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="display-layout"> <dom-module id="display-layout">
<template> <template>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<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/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="../chromeos/os_icons.html"> <link rel="import" href="../os_icons.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-display-overscan-dialog"> <dom-module id="settings-display-overscan-dialog">
<template> <template>
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
<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/cr.html"> <link rel="import" href="chrome://resources/html/cr.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.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="../route.html"> <link rel="import" href="../../route.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-keyboard"> <dom-module id="settings-keyboard">
<template> <template>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<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/polymer/v1_0/iron-resizable-behavior/iron-resizable-behavior.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-resizable-behavior/iron-resizable-behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-behaviors/paper-ripple-behavior.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-behaviors/paper-ripple-behavior.html">
<link rel="import" href="../prefs/prefs_behavior.html"> <link rel="import" href="../../prefs/prefs_behavior.html">
<dom-module id="night-light-slider"> <dom-module id="night-light-slider">
<template> <template>
......
...@@ -125,10 +125,13 @@ Polymer({ ...@@ -125,10 +125,13 @@ Polymer({
return; return;
} }
const startHour = /** @type {number} */ ( const startHour =
this.getPref('ash.night_light.custom_start_time').value) / 60.0; /** @type {number} */ (
this.getPref('ash.night_light.custom_start_time').value) /
60.0;
const endHour = /** @type {number} */ ( const endHour = /** @type {number} */ (
this.getPref('ash.night_light.custom_end_time').value) / 60.0; this.getPref('ash.night_light.custom_end_time').value) /
60.0;
const markersContainer = this.$.markersContainer; const markersContainer = this.$.markersContainer;
markersContainer.innerHTML = ''; markersContainer.innerHTML = '';
...@@ -207,8 +210,9 @@ Polymer({ ...@@ -207,8 +210,9 @@ Polymer({
if (event.target == this.$.startKnob || if (event.target == this.$.startKnob ||
event.target == this.$.startKnob.firstElementChild) { event.target == this.$.startKnob.firstElementChild) {
this.dragObject_ = this.$.startKnob; this.dragObject_ = this.$.startKnob;
} else if (event.target == this.$.endKnob || } else if (
event.target == this.$.endKnob.firstElementChild) { event.target == this.$.endKnob ||
event.target == this.$.endKnob.firstElementChild) {
this.dragObject_ = this.$.endKnob; this.dragObject_ = this.$.endKnob;
} else { } else {
return; return;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
<link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button.html"> <link rel="import" href="chrome://resources/cr_elements/cr_radio_button/cr_radio_button.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="../chromeos/localized_link/localized_link.html"> <link rel="import" href="../localized_link/localized_link.html">
<link rel="import" href="../controls/settings_radio_group.html"> <link rel="import" href="../../controls/settings_radio_group.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="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="device_page_browser_proxy.html"> <link rel="import" href="device_page_browser_proxy.html">
<dom-module id="settings-pointers"> <dom-module id="settings-pointers">
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
<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_toggle_button.html"> <link rel="import" href="../../controls/settings_toggle_button.html">
<link rel="import" href="../route.html"> <link rel="import" href="../../route.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-power"> <dom-module id="settings-power">
<template> <template>
......
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
<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="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="storage_external.html"> <link rel="import" href="storage_external.html">
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../../prefs/prefs.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">
<dom-module id="settings-storage"> <dom-module id="settings-storage">
<template> <template>
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<link rel="import" href="chrome://resources/html/assert.html"> <link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> <link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="storage_external_entry.html"> <link rel="import" href="storage_external_entry.html">
<link rel="import" href="../chromeos/localized_link/localized_link.html"> <link rel="import" href="../localized_link/localized_link.html">
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../../prefs/prefs.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-storage-external"> <dom-module id="settings-storage-external">
<template> <template>
......
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/html/assert.html"> <link rel="import" href="chrome://resources/html/assert.html">
<link rel="import" href="../prefs/prefs.html"> <link rel="import" href="../../prefs/prefs.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="storage-external-entry"> <dom-module id="storage-external-entry">
<template> <template>
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
<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/action_link.html"> <link rel="import" href="chrome://resources/html/action_link.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html"> <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner-lite.html">
<link rel="import" href="../controls/settings_toggle_button.html"> <link rel="import" href="../../controls/settings_toggle_button.html">
<link rel="import" href="../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-stylus"> <dom-module id="settings-stylus">
<template> <template>
......
...@@ -29,7 +29,7 @@ js_library("manage_a11y_page") { ...@@ -29,7 +29,7 @@ js_library("manage_a11y_page") {
deps = [ deps = [
"../..:route", "../..:route",
"../..:route_origin_behavior", "../..:route_origin_behavior",
"../../device_page:device_page_browser_proxy", "../device_page:device_page_browser_proxy",
"//ui/webui/resources/js:load_time_data", "//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior", "//ui/webui/resources/js:web_ui_listener_behavior",
] ]
......
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<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="../../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="../device_page/device_page_browser_proxy.html">
<link rel="import" href="../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">
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<link rel="import" href="../crostini_page/crostini_page.html"> <link rel="import" href="../crostini_page/crostini_page.html">
<link rel="import" href="../plugin_vm_page/plugin_vm_page.html"> <link rel="import" href="../plugin_vm_page/plugin_vm_page.html">
<link rel="import" href="../../prefs/prefs_behavior.html"> <link rel="import" href="../../prefs/prefs_behavior.html">
<link rel="import" href="../../device_page/device_page.html"> <link rel="import" href="../device_page/device_page.html">
<link rel="import" href="../internet_page/internet_page.html"> <link rel="import" href="../internet_page/internet_page.html">
<link rel="import" href="../../multidevice_page/multidevice_page.html"> <link rel="import" href="../../multidevice_page/multidevice_page.html">
......
...@@ -496,94 +496,94 @@ ...@@ -496,94 +496,94 @@
file="site_settings/cookie_info.js" file="site_settings/cookie_info.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_BROWSER_PROXY_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_BROWSER_PROXY_HTML"
file="device_page/device_page_browser_proxy.html" file="chromeos/device_page/device_page_browser_proxy.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_BROWSER_PROXY_JS" <structure name="IDR_OS_SETTINGS_DEVICE_BROWSER_PROXY_JS"
file="device_page/device_page_browser_proxy.js" file="chromeos/device_page/device_page_browser_proxy.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_HTML"
file="device_page/display.html" file="chromeos/device_page/display.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_JS" <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_JS"
file="device_page/display.js" file="chromeos/device_page/display.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_LAYOUT_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_LAYOUT_HTML"
file="device_page/display_layout.html" file="chromeos/device_page/display_layout.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_LAYOUT_JS" <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_LAYOUT_JS"
file="device_page/display_layout.js" file="chromeos/device_page/display_layout.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_OVERSCAN_DIALOG_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_OVERSCAN_DIALOG_HTML"
file="device_page/display_overscan_dialog.html" file="chromeos/device_page/display_overscan_dialog.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_OVERSCAN_DIALOG_JS" <structure name="IDR_OS_SETTINGS_DEVICE_DISPLAY_OVERSCAN_DIALOG_JS"
file="device_page/display_overscan_dialog.js" file="chromeos/device_page/display_overscan_dialog.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_KEYBOARD_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_KEYBOARD_HTML"
file="device_page/keyboard.html" file="chromeos/device_page/keyboard.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_KEYBOARD_JS" <structure name="IDR_OS_SETTINGS_DEVICE_KEYBOARD_JS"
file="device_page/keyboard.js" file="chromeos/device_page/keyboard.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_POWER_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_POWER_HTML"
file="device_page/power.html" file="chromeos/device_page/power.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_POWER_JS" <structure name="IDR_OS_SETTINGS_DEVICE_POWER_JS"
file="device_page/power.js" file="chromeos/device_page/power.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_STORAGE_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_STORAGE_HTML"
file="device_page/storage.html" file="chromeos/device_page/storage.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_STORAGE_JS" <structure name="IDR_OS_SETTINGS_DEVICE_STORAGE_JS"
file="device_page/storage.js" file="chromeos/device_page/storage.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_ENTRY_HTML" <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_ENTRY_HTML"
file="device_page/storage_external_entry.html" file="chromeos/device_page/storage_external_entry.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_ENTRY_JS" <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_ENTRY_JS"
file="device_page/storage_external_entry.js" file="chromeos/device_page/storage_external_entry.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_HTML" <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_HTML"
file="device_page/storage_external.html" file="chromeos/device_page/storage_external.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_JS" <structure name="IDR_SETTINGS_DEVICE_STORAGE_EXTERNAL_JS"
file="device_page/storage_external.js" file="chromeos/device_page/storage_external.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_STYLUS_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_STYLUS_HTML"
file="device_page/stylus.html" file="chromeos/device_page/stylus.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_STYLUS_JS" <structure name="IDR_OS_SETTINGS_DEVICE_STYLUS_JS"
file="device_page/stylus.js" file="chromeos/device_page/stylus.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_PAGE_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_PAGE_HTML"
file="device_page/device_page.html" file="chromeos/device_page/device_page.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_PAGE_JS" <structure name="IDR_OS_SETTINGS_DEVICE_PAGE_JS"
file="device_page/device_page.js" file="chromeos/device_page/device_page.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_POINTERS_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_POINTERS_HTML"
file="device_page/pointers.html" file="chromeos/device_page/pointers.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_POINTERS_JS" <structure name="IDR_OS_SETTINGS_DEVICE_POINTERS_JS"
file="device_page/pointers.js" file="chromeos/device_page/pointers.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DRAG_BEHAVIOR_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_DRAG_BEHAVIOR_HTML"
file="device_page/drag_behavior.html" file="chromeos/device_page/drag_behavior.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_DRAG_BEHAVIOR_JS" <structure name="IDR_OS_SETTINGS_DEVICE_DRAG_BEHAVIOR_JS"
file="device_page/drag_behavior.js" file="chromeos/device_page/drag_behavior.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_HTML"
file="device_page/layout_behavior.html" file="chromeos/device_page/layout_behavior.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_JS" <structure name="IDR_OS_SETTINGS_DEVICE_LAYOUT_BEHAVIOR_JS"
file="device_page/layout_behavior.js" file="chromeos/device_page/layout_behavior.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_NIGHT_LIGHT_SLIDER_HTML" <structure name="IDR_OS_SETTINGS_DEVICE_NIGHT_LIGHT_SLIDER_HTML"
file="device_page/night_light_slider.html" file="chromeos/device_page/night_light_slider.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DEVICE_NIGHT_LIGHT_SLIDER_JS" <structure name="IDR_OS_SETTINGS_DEVICE_NIGHT_LIGHT_SLIDER_JS"
file="device_page/night_light_slider.js" file="chromeos/device_page/night_light_slider.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_FILES_PAGE_HTML" <structure name="IDR_OS_SETTINGS_FILES_PAGE_HTML"
file="chromeos/os_files_page/os_files_page.html" file="chromeos/os_files_page/os_files_page.html"
......
...@@ -385,7 +385,7 @@ TEST_F('OSSettingsDateTimePageTest', 'AllJsTests', () => { ...@@ -385,7 +385,7 @@ TEST_F('OSSettingsDateTimePageTest', 'AllJsTests', () => {
var OSSettingsDevicePageTest = class extends OSSettingsBrowserTest { var OSSettingsDevicePageTest = class extends OSSettingsBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return super.browsePreload + 'device_page/device_page.html'; return super.browsePreload + 'chromeos/device_page/device_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