Skip to content

GitLab

T
tangled
Commit fcdea419 authored by James Vecore's avatar James Vecore Committed by Commit Bot
Browse files
Options

[Nearby] Move Nearby Share settings subpage to be CrOS only 

Originally when the settings subpage as added, Nearby Share was intended
to support both CrOS and other Desktop browser platforms.  OS settings
and browser settings will continue to diverge and it is likely a
different settings implementation will be needed anyways. See the bug
for more details.

Fixed: 1121275
Change-Id: I95a44fd32f03fd409a3749aa2d2dc7a4f3400e2c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2376980
Commit-Queue: James Vecore <vecore@google.com>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802148}
parent 0a7f5359
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 83 deletions
WATCHLISTS
View file @ fcdea419
......@@ -1344,7 +1344,7 @@
'filepath': 'chrome/browser/nearby_sharing/|'\
'chrome/browser/resources/nearby_internals/|'\
'chrome/browser/resources/nearby_share/|'\
'chrome/browser/resources/settings/nearby_share_page/|'\
'chrome/browser/resources/settings/chromeos/nearby_share_page/|'\
'chrome/browser/ui/webui/nearby_internals/|'\
'chrome/browser/ui/webui/nearby_share/|'\
'chrome/services/sharing/'
......
chrome/browser/resources/settings/BUILD.gn
View file @ fcdea419
......@@ -71,7 +71,6 @@ group("closure_compile") {
"appearance_page:closure_compile",
"controls:closure_compile",
"languages_page:closure_compile",
"nearby_share_page:closure_compile",
"people_page:closure_compile",
"prefs:closure_compile",
"privacy_page:closure_compile",
......@@ -157,7 +156,6 @@ group("closure_compile_module") {
"controls:closure_compile_module",
"downloads_page:closure_compile_module",
"languages_page:closure_compile_module",
"nearby_share_page:closure_compile_module",
"on_startup_page:closure_compile_module",
"people_page:closure_compile_module",
"prefs:closure_compile_module",
......
chrome/browser/resources/settings/chromeos/BUILD.gn
View file @ fcdea419
......@@ -200,6 +200,7 @@ group("closure_compile") {
"internet_page:closure_compile",
"localized_link:closure_compile",
"multidevice_page:closure_compile",
"nearby_share_page:closure_compile",
"os_a11y_page:closure_compile",
"os_apps_page:closure_compile",
"os_files_page:closure_compile",
......@@ -296,6 +297,7 @@ group("closure_compile_module") {
#"internet_page:closure_compile_module",
"localized_link:closure_compile_module",
"multidevice_page:closure_compile_module",
"nearby_share_page:closure_compile_module",
#"os_a11y_page:closure_compile_module",
"os_about_page:closure_compile_module",
......@@ -433,6 +435,7 @@ group("polymer3_elements") {
"internet_page:polymer3_elements",
"localized_link:polymer3_elements",
"multidevice_page:polymer3_elements",
"nearby_share_page:polymer3_elements",
"os_a11y_page:polymer3_elements",
"os_about_page:polymer3_elements",
"os_apps_page:polymer3_elements",
......@@ -464,7 +467,6 @@ group("polymer3_elements") {
"..:settings_vars_css_module",
"../../settings:settings_page_css_module",
"../about_page:modulize",
"../nearby_share_page:polymer3_elements",
"../prefs:modulize",
"../prefs:prefs_module",
"../settings_page:settings_animated_pages_module",
......
chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_page.html
View file @ fcdea419
......@@ -12,11 +12,11 @@
<link rel="import" href="../os_route.html">
<link rel="import" href="../../router.html">
<link rel="import" href="../../controls/password_prompt_dialog.html">
<link rel="import" href="../../nearby_share_page/nearby_share_subpage.html">
<link rel="import" href="../../settings_page/settings_animated_pages.html">
<link rel="import" href="../../settings_page/settings_subpage.html">
<link rel="import" href="../../prefs/prefs_behavior.html">
<link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../nearby_share_page/nearby_share_subpage.html">
<link rel="import" href="../localized_link/localized_link.html">
<link rel="import" href="../metrics_recorder.html">
<link rel="import" href="multidevice_browser_proxy.html">
......
chrome/browser/resources/settings/nearby_share_page/BUILD.gn → chrome/browser/resources/settings/chromeos/nearby_share_page/BUILD.gn
View file @ fcdea419
......@@ -5,8 +5,8 @@
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni")
import("//ui/webui/resources/tools/js_modulizer.gni")
import("../../nearby_share/shared/nearby_shared.gni")
import("../settings.gni")
import("../../../nearby_share/shared/nearby_shared.gni")
import("../os_settings.gni")
js_type_check("closure_compile") {
deps = [
......@@ -30,9 +30,9 @@ js_library("nearby_share_contact_visibility_dialog") {
js_library("nearby_share_data_usage_dialog") {
deps = [
":types",
"../prefs",
"../prefs:prefs_behavior",
"../prefs:prefs_types",
"../../prefs",
"../../prefs:prefs_behavior",
"../../prefs:prefs_types",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
"//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button",
......@@ -43,9 +43,9 @@ js_library("nearby_share_data_usage_dialog") {
js_library("nearby_share_device_name_dialog") {
deps = [
"../prefs",
"../prefs:prefs_behavior",
"../prefs:prefs_types",
"../../prefs",
"../../prefs:prefs_behavior",
"../../prefs:prefs_types",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
"//ui/webui/resources/cr_elements/cr_input:cr_input",
......@@ -59,10 +59,10 @@ js_library("nearby_share_subpage") {
":nearby_share_data_usage_dialog",
":nearby_share_device_name_dialog",
":types",
"..:router",
"../prefs",
"../prefs:prefs_behavior",
"../prefs:prefs_types",
"../..:router",
"../../prefs",
"../../prefs:prefs_behavior",
"../../prefs:prefs_types",
"//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page",
"//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior",
"//chrome/browser/resources/nearby_share/shared:nearby_visibility_page",
......@@ -81,8 +81,8 @@ group("polymer3_elements") {
":nearby_share_data_usage_dialog_module",
":nearby_share_device_name_dialog_module",
":nearby_share_subpage_module",
"../controls:polymer3_elements",
"../prefs:polymer3_elements",
"../../controls:polymer3_elements",
"../../prefs:polymer3_elements",
]
}
......@@ -90,9 +90,9 @@ js_type_check("closure_compile_module") {
is_polymer3 = true
# TODO(crbug.com/1121865): browser_resolver_prefix_replacements allows path
# from ../shared/* to resolve to ../../nearby_share/shared/* for closure
# from ../../shared/* to resolve to ../../../nearby_share/shared/* for closure
# purposes.
closure_flags = default_closure_args + [ "browser_resolver_prefix_replacements=\"../shared/=../../nearby_share/shared/\"" ]
closure_flags = default_closure_args + [ "browser_resolver_prefix_replacements=\"../../shared/=../../../nearby_share/shared/\"" ]
deps = [
":nearby_share_contact_visibility_dialog.m",
":nearby_share_data_usage_dialog.m",
......@@ -102,7 +102,7 @@ js_type_check("closure_compile_module") {
}
js_library("nearby_share_contact_visibility_dialog.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_contact_visibility_dialog.m.js" ]
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.m.js" ]
deps = [
"//chrome/browser/resources/nearby_share/shared:nearby_contact_visibility.m",
"//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
......@@ -113,12 +113,12 @@ js_library("nearby_share_contact_visibility_dialog.m") {
}
js_library("nearby_share_data_usage_dialog.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_data_usage_dialog.m.js" ]
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_data_usage_dialog.m.js" ]
deps = [
":types.m",
"../prefs:prefs.m",
"../prefs:prefs_behavior.m",
"../prefs:prefs_types.m",
"../../prefs:prefs.m",
"../../prefs:prefs_behavior.m",
"../../prefs:prefs_types.m",
"//ui/webui/resources/cr_elements/cr_button:cr_button.m",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
"//ui/webui/resources/cr_elements/cr_radio_button:cr_radio_button.m",
......@@ -129,11 +129,11 @@ js_library("nearby_share_data_usage_dialog.m") {
}
js_library("nearby_share_device_name_dialog.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_device_name_dialog.m.js" ]
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_device_name_dialog.m.js" ]
deps = [
"../prefs:prefs.m",
"../prefs:prefs_behavior.m",
"../prefs:prefs_types.m",
"../../prefs:prefs.m",
"../../prefs:prefs_behavior.m",
"../../prefs:prefs_types.m",
"//ui/webui/resources/cr_elements/cr_button:cr_button.m",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog.m",
"//ui/webui/resources/cr_elements/cr_input:cr_input.m",
......@@ -143,16 +143,16 @@ js_library("nearby_share_device_name_dialog.m") {
}
js_library("nearby_share_subpage.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/nearby_share_subpage.m.js" ]
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.m.js" ]
deps = [
":nearby_share_contact_visibility_dialog.m",
":nearby_share_data_usage_dialog.m",
":nearby_share_device_name_dialog.m",
":types.m",
"..:router.m",
"../prefs:prefs.m",
"../prefs:prefs_behavior.m",
"../prefs:prefs_types.m",
"../..:router.m",
"../../prefs:prefs.m",
"../../prefs:prefs_behavior.m",
"../../prefs:prefs_types.m",
"//chrome/browser/resources/nearby_share/shared:nearby_onboarding_page.m",
"//chrome/browser/resources/nearby_share/shared:nearby_share_settings_behavior.m",
"//chrome/browser/resources/nearby_share/shared:nearby_visibility_page.m",
......@@ -163,21 +163,22 @@ js_library("nearby_share_subpage.m") {
}
js_library("types.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/settings/nearby_share_page/types.m.js" ]
sources = [ "$root_gen_dir/chrome/browser/resources/settings/chromeos/nearby_share_page/types.m.js" ]
extra_deps = [ ":modulize" ]
}
js_modulizer("modulize") {
input_files = [ "types.js" ]
namespace_rewrites = settings_namespace_rewrites
namespace_rewrites = os_settings_namespace_rewrites
}
nearby_shared_auto_imports_closure_fix = [
# TODO(crbug.com/1121865): polymer.py normalizes the relative paths to shared
# nearby resources like ../shared/* against c/b/r/settings/nearby_share_page
# genreating paths with the prefix c/b/r/settings/shared/*. It uses the
# normalized path to look up relative references for auto import. In order get
# the auto import to match, we need to use this path prefix even though it
# nearby resources like ../../shared/* against
# c/b/r/settings/chromeos/nearby_share_page
# generating paths with the prefix c/b/r/settings/shared/*. It uses the
# normalized path to look up relative references for auto import. In order to
# get the auto import to match, we need to use this path prefix even though it
# does not exist on disk there. The actual resources are in
# c/b/r/nearby_share/shared and are re-hosted in the chrome://os-settings
# webui at the chrome://os-settings/shared/* prefix.
......@@ -189,24 +190,25 @@ polymer_modulizer("nearby_share_contact_visibility_dialog") {
html_file = "nearby_share_contact_visibility_dialog.html"
html_type = "dom-module"
namespace_rewrites =
settings_namespace_rewrites + nearby_shared_namespace_rewrites
auto_imports = settings_auto_imports + nearby_shared_auto_imports_closure_fix
os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
auto_imports =
os_settings_auto_imports + nearby_shared_auto_imports_closure_fix
}
polymer_modulizer("nearby_share_data_usage_dialog") {
js_file = "nearby_share_data_usage_dialog.js"
html_file = "nearby_share_data_usage_dialog.html"
html_type = "dom-module"
namespace_rewrites = settings_namespace_rewrites
auto_imports = settings_auto_imports
namespace_rewrites = os_settings_namespace_rewrites
auto_imports = os_settings_auto_imports
}
polymer_modulizer("nearby_share_device_name_dialog") {
js_file = "nearby_share_device_name_dialog.js"
html_file = "nearby_share_device_name_dialog.html"
html_type = "dom-module"
namespace_rewrites = settings_namespace_rewrites
auto_imports = settings_auto_imports
namespace_rewrites = os_settings_namespace_rewrites
auto_imports = os_settings_auto_imports
}
polymer_modulizer("nearby_share_subpage") {
......@@ -214,8 +216,8 @@ polymer_modulizer("nearby_share_subpage") {
html_file = "nearby_share_subpage.html"
html_type = "dom-module"
namespace_rewrites =
settings_namespace_rewrites + nearby_shared_namespace_rewrites
os_settings_namespace_rewrites + nearby_shared_namespace_rewrites
auto_imports =
settings_auto_imports + nearby_shared_auto_imports_closure_fix +
os_settings_auto_imports + nearby_shared_auto_imports_closure_fix +
[ "chrome/browser/resources/settings/chromeos/os_route.html|routes" ]
}
chrome/browser/resources/settings/nearby_share_page/nearby_share_contact_visibility_dialog.html → chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.html
View file @ fcdea419
......@@ -2,10 +2,10 @@
<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="../shared/nearby_contact_visibility.html">
<link rel="import" href="../shared/nearby_onboarding_page.html">
<link rel="import" href="../shared/nearby_share_settings_behavior.html">
<link rel="import" href="../shared/nearby_visibility_page.html">
<link rel="import" href="../../shared/nearby_contact_visibility.html">
<link rel="import" href="../../shared/nearby_onboarding_page.html">
<link rel="import" href="../../shared/nearby_share_settings_behavior.html">
<link rel="import" href="../../shared/nearby_visibility_page.html">
<!-- TODO(vecore): The two imports above for onboarding and visibility pages are
temporary. They are need to ensure the pages are included in the
......
chrome/browser/resources/settings/nearby_share_page/nearby_share_data_usage_dialog.html → chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_data_usage_dialog.html
View file @ fcdea419
......@@ -5,8 +5,8 @@
<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_group/cr_radio_group.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../prefs/prefs_behavior.html">
<link rel="import" href="../../prefs/prefs.html">
<link rel="import" href="../../prefs/prefs_behavior.html">
<link rel="import" href="types.html">
<dom-module id="nearby-share-data-usage-dialog">
......
chrome/browser/resources/settings/nearby_share_page/nearby_share_device_name_dialog.html → chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_device_name_dialog.html
View file @ fcdea419
......@@ -5,8 +5,8 @@
<link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../prefs/prefs_behavior.html">
<link rel="import" href="../../prefs/prefs.html">
<link rel="import" href="../../prefs/prefs_behavior.html">
<dom-module id="nearby-share-device-name-dialog">
<template>
......
chrome/browser/resources/settings/nearby_share_page/nearby_share_subpage.html → chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.html
View file @ fcdea419
......@@ -2,13 +2,13 @@
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="../chromeos/os_route.html">
<link rel="import" href="../controls/settings_toggle_button.html">
<link rel="import" href="../prefs/prefs.html">
<link rel="import" href="../prefs/prefs_behavior.html">
<link rel="import" href="../router.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../shared/nearby_share_settings_behavior.html">
<link rel="import" href="../../controls/settings_toggle_button.html">
<link rel="import" href="../../prefs/prefs.html">
<link rel="import" href="../../prefs/prefs_behavior.html">
<link rel="import" href="../../router.html">
<link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../../shared/nearby_share_settings_behavior.html">
<link rel="import" href="../os_route.html">
<link rel="import" href="nearby_share_contact_visibility_dialog.html">
<link rel="import" href="nearby_share_device_name_dialog.html">
<link rel="import" href="nearby_share_data_usage_dialog.html">
......
chrome/browser/resources/settings/chromeos/os_settings.gni
View file @ fcdea419
......@@ -90,6 +90,7 @@ os_settings_auto_imports = settings_auto_imports +
"chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_constants.html|MultiDeviceSettingsMode,MultiDeviceFeature,MultiDeviceFeatureState,MultiDevicePageContentData,SmartLockSignInEnabledState",
"chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_feature_behavior.html|MultiDeviceFeatureBehavior",
"chrome/browser/resources/settings/chromeos/multidevice_page/multidevice_browser_proxy.html|MultiDeviceBrowserProxy,MultiDeviceBrowserProxyImpl",
"chrome/browser/resources/settings/chromeos/nearby_share_page/types.html|NearbyShareDataUsage,dataUsageStringToEnum",
"chrome/browser/resources/settings/chromeos/os_languages_page/input_method_util.html|generateOptions,getFirstPartyInputMethodEngineId,getOptionLabelName,getOptionMenuItems,getOptionUiType,getOptionUrl,hasOptionsPageInSettings,InputToolCode,isNumberValue,OPTION_DEFAULT,OptionType,UiType",
"chrome/browser/resources/settings/chromeos/os_languages_page/languages_metrics_proxy.html|LanguagesMetricsProxy, LanguagesMetricsProxyImpl, LanguagesPageInteraction",
"chrome/browser/resources/settings/chromeos/os_people_page/fingerprint_browser_proxy.html|FingerprintInfo,FingerprintBrowserProxy,FingerprintResultType,FingerprintBrowserProxyImpl,FingerprintAttempt,FingerprintScan",
......
chrome/browser/resources/settings/chromeos/os_settings.js
View file @ fcdea419
......@@ -7,7 +7,7 @@ import './localized_link/localized_link.m.js';
import './bluetooth_page/bluetooth_page.m.js';
import './bluetooth_page/bluetooth_subpage.m.js';
import './bluetooth_page/bluetooth_device_list_item.m.js';
import '../nearby_share_page/nearby_share_subpage.m.js';
import './nearby_share_page/nearby_share_subpage.m.js';
import './multidevice_page/multidevice_page.m.js';
import '../prefs/prefs.m.js';
import './personalization_page/personalization_page.m.js';
......@@ -23,7 +23,6 @@ import './os_about_page/update_warning_dialog.m.js';
export {AboutPageBrowserProxyImpl, BrowserChannel, UpdateStatus} from '../about_page/about_page_browser_proxy.m.js';
export {LifetimeBrowserProxy, LifetimeBrowserProxyImpl} from '../lifetime_browser_proxy.m.js';
export {dataUsageStringToEnum, NearbyShareDataUsage} from '../nearby_share_page/types.m.js';
export {pageVisibility} from '../page_visibility.js';
export {AccountManagerBrowserProxy, AccountManagerBrowserProxyImpl} from '../people_page/account_manager_browser_proxy.m.js';
export {ProfileInfoBrowserProxy, ProfileInfoBrowserProxyImpl} from '../people_page/profile_info_browser_proxy.m.js';
......@@ -37,6 +36,7 @@ export {AmbientModeTemperatureUnit, AmbientModeTopicSource} from './ambient_mode
export {bluetoothApis} from './bluetooth_page/bluetooth_page.m.js';
export {MultiDeviceBrowserProxy, MultiDeviceBrowserProxyImpl} from './multidevice_page/multidevice_browser_proxy.m.js';
export {MultiDeviceFeature, MultiDeviceFeatureState, MultiDevicePageContentData, MultiDeviceSettingsMode, SmartLockSignInEnabledState} from './multidevice_page/multidevice_constants.m.js';
export {dataUsageStringToEnum, NearbyShareDataUsage} from './nearby_share_page/types.m.js';
export {KerberosAccountsBrowserProxyImpl, KerberosConfigErrorCode, KerberosErrorType} from './os_people_page/kerberos_accounts_browser_proxy.m.js';
export {OsResetBrowserProxyImpl} from './os_reset_page/os_reset_browser_proxy.m.js';
export {routes} from './os_route.m.js';
......
chrome/browser/resources/settings/chromeos/os_settings_resources_v3.grdp
View file @ fcdea419
......@@ -644,27 +644,27 @@
compress="false"
type="BINDATA"/>
<include name="IDR_OS_SETTINGS_NEARBY_SHARE_SUBPAGE_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/nearby_share_subpage.m.js"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_subpage.m.js"
use_base_dir="false"
compress="false"
type="BINDATA" />
<include name="IDR_OS_SETTINGS_NEARBY_SHARE_CONTACT_VISIBILITY_DIALOG_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/nearby_share_contact_visibility_dialog.m.js"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.m.js"
use_base_dir="false"
compress="false"
type="BINDATA" />
<include name="IDR_OS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_DIALOG_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/nearby_share_device_name_dialog.m.js"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_device_name_dialog.m.js"
use_base_dir="false"
compress="false"
type="BINDATA" />
<include name="IDR_OS_SETTINGS_NEARBY_SHARE_DATA_USAGE_DIALOG_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/nearby_share_data_usage_dialog.m.js"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/nearby_share_data_usage_dialog.m.js"
use_base_dir="false"
compress="false"
type="BINDATA" />
<include name="IDR_OS_SETTINGS_NEARBY_SHARE_TYPES_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/nearby_share_page/types.m.js"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/nearby_share_page/types.m.js"
use_base_dir="false"
compress="false"
type="BINDATA" />
......
chrome/browser/resources/settings/os_settings_resources.grd
View file @ fcdea419
......@@ -1311,34 +1311,34 @@
file="chromeos/multidevice_page/multidevice_tether_item.js"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_CONTACT_VISIBILITY_DIALOG_HTML"
file="nearby_share_page/nearby_share_contact_visibility_dialog.html"
file="chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.html"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_CONTACT_VISIBILITY_DIALOG_JS"
file="nearby_share_page/nearby_share_contact_visibility_dialog.js"
file="chromeos/nearby_share_page/nearby_share_contact_visibility_dialog.js"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_DIALOG_HTML"
file="nearby_share_page/nearby_share_device_name_dialog.html"
file="chromeos/nearby_share_page/nearby_share_device_name_dialog.html"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DEVICE_NAME_DIALOG_JS"
file="nearby_share_page/nearby_share_device_name_dialog.js"
file="chromeos/nearby_share_page/nearby_share_device_name_dialog.js"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DATA_USAGE_DIALOG_HTML"
file="nearby_share_page/nearby_share_data_usage_dialog.html"
file="chromeos/nearby_share_page/nearby_share_data_usage_dialog.html"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_DATA_USAGE_DIALOG_JS"
file="nearby_share_page/nearby_share_data_usage_dialog.js"
file="chromeos/nearby_share_page/nearby_share_data_usage_dialog.js"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_TYPES_HTML"
file="nearby_share_page/types.html"
file="chromeos/nearby_share_page/types.html"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_TYPES_JS"
file="nearby_share_page/types.js"
file="chromeos/nearby_share_page/types.js"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_SUBPAGE_HTML"
file="nearby_share_page/nearby_share_subpage.html"
file="chromeos/nearby_share_page/nearby_share_subpage.html"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NEARBY_SHARE_SUBPAGE_JS"
file="nearby_share_page/nearby_share_subpage.js"
file="chromeos/nearby_share_page/nearby_share_subpage.js"
compress="false" type="chrome_html" />
<structure name="IDR_OS_SETTINGS_NETWORK_PROXY_SECTION_HTML"
file="chromeos/internet_page/network_proxy_section.html"
......
chrome/browser/resources/settings/settings.gni
View file @ fcdea419
......@@ -134,7 +134,6 @@ settings_auto_imports = [
"chrome/browser/resources/settings/extension_control_browser_proxy.html|ExtensionControlBrowserProxyImpl,ExtensionControlBrowserProxy",
"chrome/browser/resources/settings/global_scroll_target_behavior.html|GlobalScrollTargetBehavior",
"chrome/browser/resources/settings/i18n_setup.html|loadTimeData",
"chrome/browser/resources/settings/nearby_share_page/types.html|NearbyShareDataUsage,dataUsageStringToEnum",
"chrome/browser/resources/settings/prefs/prefs_behavior.html|PrefsBehavior",
"chrome/browser/resources/settings/prefs/prefs_types.html|CrSettingsPrefs",
"chrome/browser/resources/settings/printing_page/printing_browser_proxy.html|PrintingBrowserProxyImpl",
......
chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js
View file @ fcdea419
......@@ -1054,7 +1054,8 @@ TEST_F('OSSettingsMultideviceSubpageTest', 'AllJsTests', () => {
var OSSettingsNearbyShareSubPageTest = class extends OSSettingsBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'nearby_share_page/nearby_share_subpage.html';
return super.browsePreload +
'chromeos/nearby_share_page/nearby_share_subpage.html';
}
/** @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