Skip to content

GitLab

T
tangled
Commit 3fb7e388 authored by Jordy Greenblatt's avatar Jordy Greenblatt Committed by Commit Bot
Browse files
Options

SplitSettings: Change text and file names for OS, i.e. s/download/file 

This CL changes the name of the 'Downloads' Settings section to 'Files'
in CrOS settings and reflects the change in the code by renaming the
corresponding files in
chrome/browser/resources/settings/chromeos/os_downloads_page/ to follow
the use the name 'file' rather than 'download'. It also factors out the
string provision into a CrOS specific AddFilesStrings function in
chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.

New text screenshot: http://screen/HzEdJpRp80Q

Bug: 978648
Change-Id: I71ea9102190ef0c45e2b578f721147e94b3a6e54
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1696180
Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
Reviewed-by: default avatarMay Lippert <maybelle@chromium.org>
Reviewed-by: default avatarHector Carmona <hcarmona@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676595}
parent 9dab25e4
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 56 deletions
chrome/app/os_settings_strings.grdp
View file @ 3fb7e388
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
Languages and input Languages and input
</message> </message>
<!-- Personalizaton Page (OS settings) --> <!-- Personalization Page (OS settings) -->
<message name="IDS_OS_SETTINGS_PERSONALIZATION" desc="Name of the OS settings page which displays personalization preferences."> <message name="IDS_OS_SETTINGS_PERSONALIZATION" desc="Name of the OS settings page which displays personalization preferences.">
Personalization Personalization
</message> </message>
...@@ -32,5 +32,10 @@ ...@@ -32,5 +32,10 @@
<message name="IDS_OS_SETTINGS_ASSISTANT" desc="Name of the settings section for the Google Assistant."> <message name="IDS_OS_SETTINGS_ASSISTANT" desc="Name of the settings section for the Google Assistant.">
Assistant Assistant
</message> </message>
<!-- Files Page (OS settings) -->
<message name="IDS_OS_SETTINGS_FILES" desc="Name of the settings page which displays file preferences.">
Files
</message>
</if> </if>
</grit-part> </grit-part>
chrome/browser/resources/settings/chromeos/BUILD.gn
View file @ 3fb7e388
...@@ -63,7 +63,7 @@ if (optimize_webui) { ...@@ -63,7 +63,7 @@ if (optimize_webui) {
group("closure_compile") { group("closure_compile") {
deps = [ deps = [
"os_a11y_page:closure_compile", "os_a11y_page:closure_compile",
"os_downloads_page:closure_compile", "os_files_page:closure_compile",
"os_languages_page:closure_compile", "os_languages_page:closure_compile",
"os_people_page:closure_compile", "os_people_page:closure_compile",
"os_printing_page:closure_compile", "os_printing_page:closure_compile",
......
chrome/browser/resources/settings/chromeos/lazy_load.html
View file @ 3fb7e388
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<body> <body>
<link rel="import" href="../date_time_page/date_time_page.html"> <link rel="import" href="../date_time_page/date_time_page.html">
<link rel="import" href="os_a11y_page/os_a11y_page.html"> <link rel="import" href="os_a11y_page/os_a11y_page.html">
<link rel="import" href="os_downloads_page/os_downloads_page.html"> <link rel="import" href="os_files_page/os_files_page.html">
<link rel="import" href="os_languages_page/os_languages_page.html"> <link rel="import" href="os_languages_page/os_languages_page.html">
<link rel="import" href="os_printing_page/os_printing_page.html"> <link rel="import" href="os_printing_page/os_printing_page.html">
<link rel="import" href="os_privacy_page/os_privacy_page.html"> <link rel="import" href="os_privacy_page/os_privacy_page.html">
......
chrome/browser/resources/settings/chromeos/os_downloads_page/BUILD.gn → chrome/browser/resources/settings/chromeos/os_files_page/BUILD.gn
View file @ 3fb7e388
...@@ -6,7 +6,7 @@ import("//third_party/closure_compiler/compile_js.gni") ...@@ -6,7 +6,7 @@ import("//third_party/closure_compiler/compile_js.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ deps = [
":os_downloads_page", ":os_files_page",
":smb_shares_page", ":smb_shares_page",
] ]
} }
...@@ -18,7 +18,7 @@ js_library("smb_shares_page") { ...@@ -18,7 +18,7 @@ js_library("smb_shares_page") {
] ]
} }
js_library("os_downloads_page") { js_library("os_files_page") {
deps = [ deps = [
"../..:page_visibility", "../..:page_visibility",
"../..:route", "../..:route",
......
chrome/browser/resources/settings/chromeos/os_downloads_page/os_downloads_page.html → chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.html
View file @ 3fb7e388
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<link rel="import" href="../../settings_shared_css.html"> <link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="smb_shares_page.html"> <link rel="import" href="smb_shares_page.html">
<dom-module id="os-settings-downloads-page"> <dom-module id="os-settings-files-page">
<template> <template>
<style include="settings-shared"></style> <style include="settings-shared"></style>
<settings-animated-pages id="pages" section="downloads" <settings-animated-pages id="pages" section="files"
focus-config="[[focusConfig_]]"> focus-config="[[focusConfig_]]">
<div route-path="default"> <div route-path="default">
<settings-toggle-button <settings-toggle-button
...@@ -34,5 +34,5 @@ ...@@ -34,5 +34,5 @@
</template> </template>
</settings-animated-pages> </settings-animated-pages>
</template> </template>
<script src="os_downloads_page.js"></script> <script src="os_files_page.js"></script>
</dom-module> </dom-module>
chrome/browser/resources/settings/chromeos/os_downloads_page/os_downloads_page.js → chrome/browser/resources/settings/chromeos/os_files_page/os_files_page.js
View file @ 3fb7e388
...@@ -4,12 +4,11 @@ ...@@ -4,12 +4,11 @@
/** /**
* @fileoverview * @fileoverview
* 'os-settings-downloads-page' is the settings page containing downloads * 'os-settings-files-page' is the settings page containing files settings.
* settings.
* *
*/ */
Polymer({ Polymer({
is: 'os-settings-downloads-page', is: 'os-settings-files-page',
properties: { properties: {
/** /**
......
chrome/browser/resources/settings/chromeos/os_settings_page/os_settings_page.html
View file @ 3fb7e388
...@@ -247,13 +247,15 @@ ...@@ -247,13 +247,15 @@
</os-settings-languages-page> </os-settings-languages-page>
</settings-section> </settings-section>
</template> </template>
<!-- TODO(jordynass): Change from downloads to files once
pageVisibility is forked for OS Settings.-->
<template is="dom-if" if="[[showPage_(pageVisibility.downloads)]]" <template is="dom-if" if="[[showPage_(pageVisibility.downloads)]]"
restamp> restamp>
<settings-section page-title="$i18n{downloadsPageTitle}" <settings-section page-title="$i18n{filesPageTitle}"
section="downloads"> section="files">
<os-settings-downloads-page prefs="{{prefs}}" <os-settings-files-page prefs="{{prefs}}"
page-visibility="[[pageVisibility.downloads]]"> page-visibility="[[pageVisibility.downloads]]">
</os-settings-downloads-page> </os-settings-files-page>
</settings-section> </settings-section>
</template> </template>
<template is="dom-if" if="[[showPage_(pageVisibility.printing)]]" <template is="dom-if" if="[[showPage_(pageVisibility.printing)]]"
......
chrome/browser/resources/settings/os_settings_resources.grd
View file @ 3fb7e388
...@@ -447,20 +447,20 @@ ...@@ -447,20 +447,20 @@
<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="device_page/night_light_slider.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_DOWNLOADS_PAGE_HTML" <structure name="IDR_OS_SETTINGS_FILES_PAGE_HTML"
file="chromeos/os_downloads_page/os_downloads_page.html" file="chromeos/os_files_page/os_files_page.html"
type="chrome_html" type="chrome_html"
preprocess="true" preprocess="true"
allowexternalscript="true" /> allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_DOWNLOADS_PAGE_JS" <structure name="IDR_OS_SETTINGS_FILES_PAGE_JS"
file="chromeos/os_downloads_page/os_downloads_page.js" file="chromeos/os_files_page/os_files_page.js"
type="chrome_html" type="chrome_html"
preprocess="true" /> preprocess="true" />
<structure name="IDR_OS_SETTINGS_SMB_SHARES_PAGE_HTML" <structure name="IDR_OS_SETTINGS_SMB_SHARES_PAGE_HTML"
file="chromeos/os_downloads_page/smb_shares_page.html" file="chromeos/os_files_page/smb_shares_page.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_SMB_SHARES_PAGE_JS" <structure name="IDR_OS_SETTINGS_SMB_SHARES_PAGE_JS"
file="chromeos/os_downloads_page/smb_shares_page.js" file="chromeos/os_files_page/smb_shares_page.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_OS_SETTINGS_I18n_SETUP_HTML" <structure name="IDR_OS_SETTINGS_I18n_SETUP_HTML"
file="i18n_setup.html" file="i18n_setup.html"
......
chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
View file @ 3fb7e388
...@@ -1037,48 +1037,53 @@ void AddDeviceStrings(content::WebUIDataSource* html_source) { ...@@ -1037,48 +1037,53 @@ void AddDeviceStrings(content::WebUIDataSource* html_source) {
html_source->AddString("naturalScrollLearnMoreLink", html_source->AddString("naturalScrollLearnMoreLink",
GetHelpUrlWithBoard(chrome::kNaturalScrollHelpURL)); GetHelpUrlWithBoard(chrome::kNaturalScrollHelpURL));
} }
#endif
void AddDownloadsStrings(content::WebUIDataSource* html_source) { void AddFilesStrings(content::WebUIDataSource* html_source) {
static constexpr LocalizedString kLocalizedStrings[] = { static constexpr LocalizedString kLocalizedStrings[] = {
{"downloadsPageTitle", IDS_SETTINGS_DOWNLOADS}, {"filesPageTitle", IDS_OS_SETTINGS_FILES},
{"downloadLocation", IDS_SETTINGS_DOWNLOAD_LOCATION}, {"smbSharesTitle", IDS_SETTINGS_DOWNLOADS_SMB_SHARES},
{"changeDownloadLocation", IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION}, {"smbSharesLearnMoreLabel",
{"promptForDownload", IDS_SETTINGS_PROMPT_FOR_DOWNLOAD}, IDS_SETTINGS_DOWNLOADS_SMB_SHARES_LEARN_MORE_LABEL},
{"disconnectGoogleDriveAccount", IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE}, {"addSmbShare", IDS_SETTINGS_DOWNLOADS_SMB_SHARES_ADD_SHARE},
{"openFileTypesAutomatically", IDS_SETTINGS_OPEN_FILE_TYPES_AUTOMATICALLY}, {"smbShareAddedSuccessfulMessage",
#if defined(OS_CHROMEOS) IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_SUCCESS_MESSAGE},
{"smbSharesTitle", IDS_SETTINGS_DOWNLOADS_SMB_SHARES}, {"smbShareAddedErrorMessage",
{"smbSharesLearnMoreLabel", IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_ERROR_MESSAGE},
IDS_SETTINGS_DOWNLOADS_SMB_SHARES_LEARN_MORE_LABEL}, {"smbShareAddedAuthFailedMessage",
{"addSmbShare", IDS_SETTINGS_DOWNLOADS_SMB_SHARES_ADD_SHARE}, IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_AUTH_FAILED_MESSAGE},
{"smbShareAddedSuccessfulMessage", {"smbShareAddedNotFoundMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_SUCCESS_MESSAGE}, IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_NOT_FOUND_MESSAGE},
{"smbShareAddedErrorMessage", {"smbShareAddedUnsupportedDeviceMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_ERROR_MESSAGE}, IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_UNSUPPORTED_DEVICE_MESSAGE},
{"smbShareAddedAuthFailedMessage", {"smbShareAddedMountExistsMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_AUTH_FAILED_MESSAGE}, IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_EXISTS_MESSAGE},
{"smbShareAddedNotFoundMessage", {"smbShareAddedInvalidURLMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_NOT_FOUND_MESSAGE}, IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_URL_MESSAGE},
{"smbShareAddedUnsupportedDeviceMessage", {"smbShareAddedInvalidSSOURLMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_UNSUPPORTED_DEVICE_MESSAGE}, IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_SSO_URL_MESSAGE},
{"smbShareAddedMountExistsMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_EXISTS_MESSAGE},
{"smbShareAddedInvalidURLMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_URL_MESSAGE},
{"smbShareAddedInvalidSSOURLMessage",
IDS_SETTINGS_DOWNLOADS_SHARE_ADDED_MOUNT_INVALID_SSO_URL_MESSAGE},
#endif
}; };
AddLocalizedStringsBulk(html_source, kLocalizedStrings, AddLocalizedStringsBulk(html_source, kLocalizedStrings,
base::size(kLocalizedStrings)); base::size(kLocalizedStrings));
#if defined(OS_CHROMEOS)
chromeos::smb_dialog::AddLocalizedStrings(html_source); chromeos::smb_dialog::AddLocalizedStrings(html_source);
html_source->AddString("smbSharesLearnMoreURL", html_source->AddString("smbSharesLearnMoreURL",
GetHelpUrlWithBoard(chrome::kSmbSharesLearnMoreURL)); GetHelpUrlWithBoard(chrome::kSmbSharesLearnMoreURL));
#endif }
#endif // defined(OS_CHROMEOS)
void AddDownloadsStrings(content::WebUIDataSource* html_source) {
static constexpr LocalizedString kLocalizedStrings[] = {
{"downloadsPageTitle", IDS_SETTINGS_DOWNLOADS},
{"downloadLocation", IDS_SETTINGS_DOWNLOAD_LOCATION},
{"changeDownloadLocation", IDS_SETTINGS_CHANGE_DOWNLOAD_LOCATION},
{"promptForDownload", IDS_SETTINGS_PROMPT_FOR_DOWNLOAD},
{"disconnectGoogleDriveAccount", IDS_SETTINGS_DISCONNECT_GOOGLE_DRIVE},
{"openFileTypesAutomatically",
IDS_SETTINGS_OPEN_FILE_TYPES_AUTOMATICALLY},
};
AddLocalizedStringsBulk(html_source, kLocalizedStrings,
base::size(kLocalizedStrings));
} }
#if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD) #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
...@@ -3221,6 +3226,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, ...@@ -3221,6 +3226,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
AddDateTimeStrings(html_source); AddDateTimeStrings(html_source);
AddDeviceStrings(html_source); AddDeviceStrings(html_source);
AddEasyUnlockStrings(html_source); AddEasyUnlockStrings(html_source);
AddFilesStrings(html_source);
AddInternetStrings(html_source); AddInternetStrings(html_source);
AddMultideviceStrings(html_source); AddMultideviceStrings(html_source);
AddParentalControlStrings(html_source); AddParentalControlStrings(html_source);
......
chrome/test/data/webui/settings/chromeos/os_advanced_page_browsertest.js
View file @ 3fb7e388
...@@ -71,7 +71,7 @@ suite('OSSettingsPage', function() { ...@@ -71,7 +71,7 @@ suite('OSSettingsPage', function() {
const page = settingsMain.$$('os-settings-page'); const page = settingsMain.$$('os-settings-page');
assertTrue(!!page); assertTrue(!!page);
let sections = let sections =
['privacy', 'languages', 'downloads', 'reset', 'dateTime', 'a11y']; ['privacy', 'languages', 'files', 'reset', 'dateTime', 'a11y'];
for (let i = 0; i < sections.length; i++) { for (let i = 0; i < sections.length; i++) {
const section = getSection(page, sections[i]); const section = getSection(page, sections[i]);
......
chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js
View file @ 3fb7e388
...@@ -45,8 +45,7 @@ const OSSettingsBrowserTest = class extends PolymerTest { ...@@ -45,8 +45,7 @@ const OSSettingsBrowserTest = class extends PolymerTest {
var OSSettingsSmbPageTest = class extends OSSettingsBrowserTest { var OSSettingsSmbPageTest = class extends OSSettingsBrowserTest {
/** @override */ /** @override */
get browsePreload() { get browsePreload() {
return super.browsePreload + return super.browsePreload + 'chromeos/os_files_page/smb_shares_page.html';
'chromeos/os_downloads_page/smb_shares_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