Skip to content

GitLab

T
tangled
Commit 9e8fca7f authored by rbpotter's avatar rbpotter Committed by Commit Bot
Browse files
Options

SplitSettings: Move CUPS printers files to c/b/r/settings/chromeos 

Moving CUPS printers files from c/b/r/settings/printing_page to
c/b/r/settings/chromeos/os_printing_page, and deleting CUPS printers
link row from browser settings printing page, since it is only shown
when showing the OS settings.

Also fixing the getEulaUrlGetsCalledOnModelChange test, as it always
fails for optimize_webui=false before this CL. This appears to have
never been detected due to https://crbug.com/1003483, which disabled
all OS settings browser tests on debug builds.

Bug: 990132
Change-Id: Iba9d153c69accd53396132d21046e055e6e3556c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1982669
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Reviewed-by: default avatarDan Beam <dbeam@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727674}
parent 3d2cd5f6
Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 357 deletions
WATCHLISTS
View file @ 9e8fca7f
......@@ -890,7 +890,7 @@
'|plugin_vm',
},
'cups_printing' : {
'filepath': 'chrome/browser/resources/settings/printing_page/'\
'filepath': 'chrome/browser/resources/settings/chromeos/os_printing_page/'\
'|chrome/test/data/webui/settings/cups_printer_page_tests.js'\
'|chrome/browser/ui/webui/settings/chromeos/cups_printers_handler'\
'|chrome/browser/chromeos/printing/'\
......
chrome/browser/resources/settings/chromeos/os_printing_page/BUILD.gn
View file @ 9e8fca7f
......@@ -6,13 +6,123 @@ import("//third_party/closure_compiler/compile_js.gni")
js_type_check("closure_compile") {
deps = [
":cups_add_printer_dialog",
":cups_add_printer_dialog_elements",
":cups_edit_printer_dialog",
":cups_printer_dialog_util",
":cups_printers",
":cups_printers_browser_proxy",
":os_printing_page",
"../../printing_page:cups_add_printer_dialog",
"../../printing_page:cups_add_printer_dialog_elements",
"../../printing_page:cups_edit_printer_dialog",
"../../printing_page:cups_printer_dialog_util",
"../../printing_page:cups_printers",
"../../printing_page:cups_printers_browser_proxy",
]
}
js_library("cups_add_printer_dialog") {
deps = [
":cups_printers_browser_proxy",
"../localized_link:localized_link",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
}
js_library("cups_add_printer_dialog_elements") {
deps = [
":cups_printers_browser_proxy",
]
}
js_library("cups_edit_printer_dialog") {
deps = [
"../localized_link:localized_link",
"//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider",
"//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
"//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
"//ui/webui/resources/cr_elements:cr_scrollable_behavior",
]
}
js_library("cups_nearby_printers") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
":cups_printers_entry",
":cups_printers_entry_list_behavior",
":cups_printers_entry_manager",
"//ui/webui/resources/js:list_property_update_behavior",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
}
js_library("cups_printer_dialog_util") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("cups_printer_types") {
deps = [
":cups_printers_browser_proxy",
]
}
js_library("cups_printers") {
deps = [
":cups_nearby_printers",
":cups_printers_browser_proxy",
":cups_printers_entry_manager",
":cups_saved_printers",
"../..:route",
"../localized_link:localized_link",
"//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider",
"//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
"//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
"//ui/webui/resources/cr_elements/cr_toast:cr_toast",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
"//ui/webui/resources/js/cr/ui:focus_without_ink",
]
}
js_library("cups_printers_browser_proxy") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("cups_printers_entry") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
]
}
js_library("cups_printers_entry_list_behavior") {
deps = [
":cups_printer_types",
"//ui/webui/resources/js:list_property_update_behavior",
]
}
js_library("cups_printers_entry_manager") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr",
]
}
js_library("cups_saved_printers") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
":cups_printers_entry",
":cups_printers_entry_list_behavior",
":cups_printers_entry_manager",
"//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
"//ui/webui/resources/js:list_property_update_behavior",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
}
......
chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html → chrome/browser/resources/settings/chromeos/os_printing_page/cups_add_printer_dialog.html
View file @ 9e8fca7f
......@@ -8,8 +8,8 @@
<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/paper-spinner/paper-spinner-lite.html">
<link rel="import" href="../chromeos/localized_link/localized_link.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../localized_link/localized_link.html">
<link rel="import" href="../../i18n_setup.html">
<link rel="import" href="cups_add_printer_dialog_elements.html">
<link rel="import" href="cups_printer_dialog_util.html">
<link rel="import" href="cups_printer_shared_css.html">
......
chrome/browser/resources/settings/printing_page/cups_edit_printer_dialog.html → chrome/browser/resources/settings/chromeos/os_printing_page/cups_edit_printer_dialog.html
View file @ 9e8fca7f
......@@ -8,8 +8,8 @@
<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/cr_searchable_drop_down/cr_searchable_drop_down.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="../chromeos/localized_link/localized_link.html">
<link rel="import" href="../i18n_setup.html">
<link rel="import" href="../localized_link/localized_link.html">
<link rel="import" href="../../i18n_setup.html">
<link rel="import" href="cups_add_printer_dialog_elements.html">
<link rel="import" href="cups_printer_dialog_util.html">
<link rel="import" href="cups_printer_shared_css.html">
......
chrome/browser/resources/settings/printing_page/cups_nearby_printers.html → chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.html
View file @ 9e8fca7f
......@@ -8,7 +8,7 @@
<link rel="import" href="cups_printers_entry_list_behavior.html">
<link rel="import" href="cups_printers_entry.html">
<link rel="import" href="cups_printers_entry_manager.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-cups-nearby-printers">
<template>
......
chrome/browser/resources/settings/printing_page/cups_nearby_printers.js → chrome/browser/resources/settings/chromeos/os_printing_page/cups_nearby_printers.js
View file @ 9e8fca7f
......@@ -11,9 +11,9 @@ Polymer({
// ListPropertyUpdateBehavior is used in CupsPrintersEntryListBehavior.
behaviors: [
CupsPrintersEntryListBehavior,
ListPropertyUpdateBehavior,
WebUIListenerBehavior,
CupsPrintersEntryListBehavior,
ListPropertyUpdateBehavior,
WebUIListenerBehavior,
],
properties: {
......@@ -63,9 +63,7 @@ Polymer({
'query-discovered-printer': 'onQueryDiscoveredPrinter_',
},
observers: [
'onSearchOrPrintersChanged_(nearbyPrinters.*, searchTerm)'
],
observers: ['onSearchOrPrintersChanged_(nearbyPrinters.*, searchTerm)'],
/**
* Redoes the search whenever |searchTerm| or |nearbyPrinters| changes.
......@@ -80,7 +78,7 @@ Polymer({
const updatedPrinters = this.searchTerm ?
this.nearbyPrinters.filter(
item => settings.printing.matchesSearchTerm(
item.printerInfo,this.searchTerm)) :
item.printerInfo, this.searchTerm)) :
this.nearbyPrinters.slice();
updatedPrinters.sort(settings.printing.sortPrinters);
......@@ -101,8 +99,8 @@ Polymer({
settings.CupsPrintersBrowserProxyImpl.getInstance()
.addDiscoveredPrinter(item.printerInfo.printerId)
.then(
this.onAddNearbyPrintersSucceeded_.bind(this,
item.printerInfo.printerName),
this.onAddNearbyPrintersSucceeded_.bind(
this, item.printerInfo.printerName),
this.onAddNearbyPrinterFailed_.bind(this));
},
......@@ -117,13 +115,13 @@ Polymer({
// This is a workaround to ensure type safety on the params of the casted
// function. We do this because the closure compiler does not work well with
// rejected js promises.
const queryDiscoveredPrinterFailed = /** @type {!Function}) */(
const queryDiscoveredPrinterFailed = /** @type {!Function}) */ (
this.onQueryDiscoveredPrinterFailed_.bind(this));
settings.CupsPrintersBrowserProxyImpl.getInstance()
.addDiscoveredPrinter(item.printerInfo.printerId)
.then(
this.onQueryDiscoveredPrinterSucceeded_.bind(this,
item.printerInfo.printerName),
this.onQueryDiscoveredPrinterSucceeded_.bind(
this, item.printerInfo.printerName),
queryDiscoveredPrinterFailed);
},
......@@ -139,7 +137,7 @@ Polymer({
this.activePrinter =
this.get(['nearbyPrinters', this.activePrinterListEntryIndex_])
.printerInfo;
.printerInfo;
},
/**
......@@ -160,10 +158,10 @@ Polymer({
* @private
*/
onAddNearbyPrinterFailed_: function(printer) {
this.fire(
'show-cups-printer-toast',
{resultCode: PrinterSetupResult.PRINTER_UNREACHABLE,
printerName: printer.printerName});
this.fire('show-cups-printer-toast', {
resultCode: PrinterSetupResult.PRINTER_UNREACHABLE,
printerName: printer.printerName
});
},
/**
......@@ -184,8 +182,9 @@ Polymer({
* @private
*/
onQueryDiscoveredPrinterFailed_: function(printer) {
this.fire('open-manufacturer-model-dialog-for-specified-printer',
{item: /** @type {CupsPrinterInfo} */(printer)});
this.fire(
'open-manufacturer-model-dialog-for-specified-printer',
{item: /** @type {CupsPrinterInfo} */ (printer)});
},
/**
......
chrome/browser/resources/settings/printing_page/cups_printer_shared_css.html → chrome/browser/resources/settings/chromeos/os_printing_page/cups_printer_shared_css.html
View file @ 9e8fca7f
......@@ -2,7 +2,7 @@
<link rel="import" href="chrome://resources/cr_elements/shared_vars_css.html">
<link rel="import" href="chrome://resources/cr_elements/md_select_css.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../../settings_shared_css.html">
<!-- Common styles for CUPS printer settings. -->
<dom-module id="cups-printer-shared">
......
chrome/browser/resources/settings/printing_page/cups_printers.html → chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.html
View file @ 9e8fca7f
......@@ -19,8 +19,8 @@
<link rel="import" href="cups_printers_entry_manager.html">
<link rel="import" href="cups_saved_printers.html">
<link rel="import" href="cups_nearby_printers.html">
<link rel="import" href="../chromeos/localized_link/localized_link.html">
<link rel="import" href="../route.html">
<link rel="import" href="../localized_link/localized_link.html">
<link rel="import" href="../../route.html">
<dom-module id="settings-cups-printers">
<template>
......
chrome/browser/resources/settings/printing_page/cups_printers.js → chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers.js
View file @ 9e8fca7f
......@@ -108,9 +108,8 @@ Polymer({
/** @override */
created: function() {
this.networkConfig_ =
network_config.MojoInterfaceProviderImpl.getInstance()
.getMojoServiceRemote();
this.networkConfig_ = network_config.MojoInterfaceProviderImpl.getInstance()
.getMojoServiceRemote();
this.entryManager_ =
settings.printing.CupsPrintersEntryManager.getInstance();
},
......@@ -182,14 +181,12 @@ Polymer({
const printerName = event.detail.printerName;
switch (event.detail.resultCode) {
case PrinterSetupResult.SUCCESS:
this.addPrinterResultText_ =
loadTimeData.getStringF('printerAddedSuccessfulMessage',
printerName);
this.addPrinterResultText_ = loadTimeData.getStringF(
'printerAddedSuccessfulMessage', printerName);
break;
case PrinterSetupResult.EDIT_SUCCESS:
this.addPrinterResultText_ =
loadTimeData.getStringF('printerEditedSuccessfulMessage',
printerName);
this.addPrinterResultText_ = loadTimeData.getStringF(
'printerEditedSuccessfulMessage', printerName);
break;
case PrinterSetupResult.PRINTER_UNREACHABLE:
if (this.enableUpdatedUi_) {
......@@ -210,8 +207,8 @@ Polymer({
*/
openManufacturerModelDialogForSpecifiedPrinter_: function(e) {
const item = e.detail.item;
this.$.addPrinterDialog
.openManufacturerModelDialogForSpecifiedPrinter(item);
this.$.addPrinterDialog.openManufacturerModelDialogForSpecifiedPrinter(
item);
},
/** @private */
......@@ -228,9 +225,8 @@ Polymer({
onPrintersChanged_: function(cupsPrintersList) {
if (this.enableUpdatedUi_) {
this.savedPrinters_ = cupsPrintersList.printerList.map(
printer => /** @type {!PrinterListEntry} */({
printerInfo: printer,
printerType: PrinterType.SAVED}));
printer => /** @type {!PrinterListEntry} */ (
{printerInfo: printer, printerType: PrinterType.SAVED}));
this.entryManager_.setSavedPrintersList(this.savedPrinters_);
} else {
this.printers = cupsPrintersList.printerList;
......@@ -297,20 +293,20 @@ Polymer({
/** @private */
getSavedPrintersAriaLabel_: function() {
const printerLabel =
this.savedPrinterCount_ == 0 ? 'savedPrintersCountNone' :
const printerLabel = this.savedPrinterCount_ == 0 ?
'savedPrintersCountNone' :
this.savedPrinterCount_ == 1 ? 'savedPrintersCountOne' :
'savedPrintersCountMany';
'savedPrintersCountMany';
return loadTimeData.getStringF(printerLabel, this.savedPrinterCount_);
},
/** @private */
getNearbyPrintersAriaLabel_: function() {
const printerLabel =
this.nearbyPrinterCount_ == 0 ? 'nearbyPrintersCountNone' :
const printerLabel = this.nearbyPrinterCount_ == 0 ?
'nearbyPrintersCountNone' :
this.nearbyPrinterCount_ == 1 ? 'nearbyPrintersCountOne' :
'nearbyPrintersCountMany';
'nearbyPrintersCountMany';
return loadTimeData.getStringF(printerLabel, this.nearbyPrinterCount_);
},
......
chrome/browser/resources/settings/printing_page/cups_printers_entry.html → chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.html
View file @ 9e8fca7f
......@@ -3,7 +3,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
<link rel="import" href="cups_printer_types.html">
<link rel="import" href="cups_printers_browser_proxy.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-cups-printers-entry">
<template>
......
chrome/browser/resources/settings/printing_page/cups_printers_entry.js → chrome/browser/resources/settings/chromeos/os_printing_page/cups_printers_entry.js
View file @ 9e8fca7f
......@@ -66,12 +66,12 @@ Polymer({
},
getSaveButtonAria_: function() {
return loadTimeData.getStringF('savePrinterAria',
this.printerEntry.printerInfo.printerName);
return loadTimeData.getStringF(
'savePrinterAria', this.printerEntry.printerInfo.printerName);
},
getSetupButtonAria_: function() {
return loadTimeData.getStringF('setupPrinterAria',
this.printerEntry.printerInfo.printerName);
return loadTimeData.getStringF(
'setupPrinterAria', this.printerEntry.printerInfo.printerName);
},
});
chrome/browser/resources/settings/printing_page/cups_saved_printers.html → chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.html
View file @ 9e8fca7f
......@@ -9,7 +9,7 @@
<link rel="import" href="cups_printers_browser_proxy.html">
<link rel="import" href="cups_printers_entry_list_behavior.html">
<link rel="import" href="cups_printers_entry.html">
<link rel="import" href="../settings_shared_css.html">
<link rel="import" href="../../settings_shared_css.html">
<dom-module id="settings-cups-saved-printers">
<template>
......
chrome/browser/resources/settings/printing_page/cups_saved_printers.js → chrome/browser/resources/settings/chromeos/os_printing_page/cups_saved_printers.js
View file @ 9e8fca7f
......@@ -102,10 +102,9 @@ Polymer({
'open-action-menu': 'onOpenActionMenu_',
},
observers: [
'onSearchOrPrintersChanged_(savedPrinters.*, searchTerm,' +
'hasShowMoreBeenTapped_, newPrinters_.*)'
],
observers:
['onSearchOrPrintersChanged_(savedPrinters.*, searchTerm,' +
'hasShowMoreBeenTapped_, newPrinters_.*)'],
/** @private {settings.CupsPrintersBrowserProxy} */
browserProxy_: null,
......@@ -143,12 +142,12 @@ Polymer({
* @private
*/
onOpenActionMenu_: function(e) {
const item = /** @type {!PrinterListEntry} */(e.detail.item);
const item = /** @type {!PrinterListEntry} */ (e.detail.item);
this.activePrinterListEntryIndex_ = this.savedPrinters.findIndex(
printer => printer.printerInfo.printerId == item.printerInfo.printerId);
this.activePrinter =
this.get(['savedPrinters', this.activePrinterListEntryIndex_])
.printerInfo;
.printerInfo;
const target = /** @type {!HTMLElement} */ (e.detail.target);
this.$$('cr-action-menu').showAt(target);
......@@ -240,8 +239,8 @@ Polymer({
currArr.splice(newPrinterRemovedIdx, 1);
}
this.visiblePrinterCounter_ = Math.max(
kMinVisiblePrinters, --this.visiblePrinterCounter_);
this.visiblePrinterCounter_ =
Math.max(kMinVisiblePrinters, --this.visiblePrinterCounter_);
}
this.set('newPrinters_', currArr);
......
chrome/browser/resources/settings/chromeos/os_printing_page/os_printing_page.html
View file @ 9e8fca7f
......@@ -5,7 +5,7 @@
<link rel="import" href="../../settings_page/settings_animated_pages.html">
<link rel="import" href="../../settings_page/settings_subpage.html">
<link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../../printing_page/cups_printers.html">
<link rel="import" href="cups_printers.html">
<dom-module id="os-settings-printing-page">
<template>
......
chrome/browser/resources/settings/os_settings_resources.grd
View file @ 9e8fca7f
......@@ -682,85 +682,79 @@
file="chromeos/os_printing_page/os_printing_page.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTER_TYPES_HTML"
file="printing_page/cups_printer_types.html"
file="chromeos/os_printing_page/cups_printer_types.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTER_TYPES_JS"
file="printing_page/cups_printer_types.js"
file="chromeos/os_printing_page/cups_printer_types.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTER_SHARED_CSS_HTML"
file="printing_page/cups_printer_shared_css.html"
file="chromeos/os_printing_page/cups_printer_shared_css.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTING_PAGE_HTML"
file="printing_page/cups_printers.html"
file="chromeos/os_printing_page/cups_printers.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTING_PAGE_JS"
file="printing_page/cups_printers.js"
file="chromeos/os_printing_page/cups_printers.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_BROWSER_PROXY_HTML"
file="printing_page/cups_printers_browser_proxy.html"
file="chromeos/os_printing_page/cups_printers_browser_proxy.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_BROWSER_PROXY_JS"
file="printing_page/cups_printers_browser_proxy.js"
file="chromeos/os_printing_page/cups_printers_browser_proxy.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_HTML"
file="printing_page/cups_printers_entry.html"
file="chromeos/os_printing_page/cups_printers_entry.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_JS"
file="printing_page/cups_printers_entry.js"
file="chromeos/os_printing_page/cups_printers_entry.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_LIST_BEHAVIOR_HTML"
file="printing_page/cups_printers_entry_list_behavior.html"
file="chromeos/os_printing_page/cups_printers_entry_list_behavior.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_LIST_BEHAVIOR_JS"
file="printing_page/cups_printers_entry_list_behavior.js"
file="chromeos/os_printing_page/cups_printers_entry_list_behavior.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_MANAGER_HTML"
file="printing_page/cups_printers_entry_manager.html"
file="chromeos/os_printing_page/cups_printers_entry_manager.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTERS_ENTRY_MANAGER_JS"
file="printing_page/cups_printers_entry_manager.js"
file="chromeos/os_printing_page/cups_printers_entry_manager.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_EDIT_PRINTER_DIALOG_HTML"
file="printing_page/cups_edit_printer_dialog.html"
file="chromeos/os_printing_page/cups_edit_printer_dialog.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_EDIT_PRINTER_DIALOG_JS"
file="printing_page/cups_edit_printer_dialog.js"
file="chromeos/os_printing_page/cups_edit_printer_dialog.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_HTML"
file="printing_page/cups_add_printer_dialog.html"
file="chromeos/os_printing_page/cups_add_printer_dialog.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_JS"
file="printing_page/cups_add_printer_dialog.js"
file="chromeos/os_printing_page/cups_add_printer_dialog.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_ELEMENTS_HTML"
file="printing_page/cups_add_printer_dialog_elements.html"
file="chromeos/os_printing_page/cups_add_printer_dialog_elements.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_ADD_PRINTER_DIALOG_ELEMENTS_JS"
file="printing_page/cups_add_printer_dialog_elements.js"
file="chromeos/os_printing_page/cups_add_printer_dialog_elements.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTER_DIALOG_UTIL_HTML"
file="printing_page/cups_printer_dialog_util.html"
file="chromeos/os_printing_page/cups_printer_dialog_util.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTER_DIALOG_UTIL_JS"
file="printing_page/cups_printer_dialog_util.js"
file="chromeos/os_printing_page/cups_printer_dialog_util.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_SAVED_PRINTERS_HTML"
file="printing_page/cups_saved_printers.html"
file="chromeos/os_printing_page/cups_saved_printers.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_SAVED_PRINTERS_JS"
file="printing_page/cups_saved_printers.js"
file="chromeos/os_printing_page/cups_saved_printers.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_NEARBY_PRINTERS_HTML"
file="printing_page/cups_nearby_printers.html"
file="chromeos/os_printing_page/cups_nearby_printers.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_NEARBY_PRINTERS_JS"
file="printing_page/cups_nearby_printers.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CLOUD_PRINTING_PAGE_HTML"
file="printing_page/cloud_printers.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CLOUD_PRINTING_PAGE_JS"
file="printing_page/cloud_printers.js"
file="chromeos/os_printing_page/cups_nearby_printers.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_OPEN_WINDOW_PROXY_HTML"
file="open_window_proxy.html"
......
chrome/browser/resources/settings/printing_page/BUILD.gn
View file @ 9e8fca7f
......@@ -10,22 +10,8 @@ js_type_check("closure_compile") {
":printing_page",
]
if (is_chromeos) {
deps += [
":cups_add_printer_dialog",
":cups_add_printer_dialog_elements",
":cups_edit_printer_dialog",
":cups_nearby_printers",
":cups_printer_dialog_util",
":cups_printer_types",
":cups_printers",
":cups_printers_browser_proxy",
":cups_printers_entry",
":cups_printers_entry_list_behavior",
":cups_printers_entry_manager",
":cups_saved_printers",
":printing_browser_proxy",
]
if (!is_chromeos) {
deps += [ ":printing_browser_proxy" ]
}
}
......@@ -49,119 +35,7 @@ js_library("printing_page") {
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:load_time_data",
]
if (is_chromeos) {
deps += [ ":cups_printers_browser_proxy" ]
}
}
if (is_chromeos) {
js_library("cups_add_printer_dialog") {
deps = [
":cups_printers_browser_proxy",
"../chromeos/localized_link:localized_link",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
}
js_library("cups_add_printer_dialog_elements") {
deps = [
":cups_printers_browser_proxy",
]
}
js_library("cups_edit_printer_dialog") {
deps = [
"../chromeos/localized_link:localized_link",
"//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider",
"//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
"//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
"//ui/webui/resources/cr_elements:cr_scrollable_behavior",
]
}
js_library("cups_nearby_printers") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
":cups_printers_entry",
":cups_printers_entry_list_behavior",
":cups_printers_entry_manager",
"//ui/webui/resources/js:list_property_update_behavior",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
}
js_library("cups_printer_types") {
deps = [
":cups_printers_browser_proxy",
]
}
js_library("cups_printer_dialog_util") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("cups_printers") {
deps = [
":cups_nearby_printers",
":cups_printers_browser_proxy",
":cups_printers_entry_manager",
":cups_saved_printers",
"..:route",
"../chromeos/localized_link:localized_link",
"//ui/webui/resources/cr_components/chromeos/network:mojo_interface_provider",
"//ui/webui/resources/cr_components/chromeos/network:network_listener_behavior",
"//ui/webui/resources/cr_components/chromeos/network:onc_mojo",
"//ui/webui/resources/cr_elements/cr_toast:cr_toast",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:load_time_data",
"//ui/webui/resources/js:web_ui_listener_behavior",
"//ui/webui/resources/js/cr/ui:focus_without_ink",
]
}
js_library("cups_printers_browser_proxy") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("cups_printers_entry") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
]
}
js_library("cups_printers_entry_list_behavior") {
deps = [
":cups_printer_types",
"//ui/webui/resources/js:list_property_update_behavior",
]
}
js_library("cups_printers_entry_manager") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr",
]
}
js_library("cups_saved_printers") {
deps = [
":cups_printer_types",
":cups_printers_browser_proxy",
":cups_printers_entry",
":cups_printers_entry_list_behavior",
":cups_printers_entry_manager",
"//ui/webui/resources/cr_elements/cr_action_menu:cr_action_menu",
"//ui/webui/resources/js:list_property_update_behavior",
"//ui/webui/resources/js:web_ui_listener_behavior",
]
if (!is_chromeos) {
deps += [ ":printing_browser_proxy" ]
}
}
chrome/browser/resources/settings/printing_page/printing_page.html
View file @ 9e8fca7f
......@@ -5,9 +5,6 @@
<link rel="import" href="../settings_page/settings_animated_pages.html">
<link rel="import" href="../settings_page/settings_subpage.html">
<link rel="import" href="../settings_shared_css.html">
<if expr="chromeos">
<link rel="import" href="cups_printers.html">
</if>
<if expr="not chromeos">
<link rel="import" href="printing_browser_proxy.html">
</if>
......@@ -18,12 +15,6 @@
<settings-animated-pages id="pages" section="printing"
focus-config="[[focusConfig_]]">
<div route-path="default">
<if expr="chromeos">
<cr-link-row hidden$="[[!showCupsPrinters_]]"
id="cupsPrinters" label="$i18n{cupsPrintersTitle}"
on-click="onTapCupsPrinters_"
role-description="$i18n{subpageArrowRoleDescription}"></cr-link-row>
</if>
<if expr="not chromeos">
<cr-link-row label="$i18n{localPrintersTitle}"
on-click="onTapLocalPrinters_" external></cr-link-row>
......@@ -33,19 +24,6 @@
role-description="$i18n{subpageArrowRoleDescription}">
</cr-link-row>
</div>
<if expr="chromeos">
<template is="dom-if" route-path="/cupsPrinters">
<settings-subpage
associated-control="[[$$('#cupsPrinters')]]"
page-title="$i18n{cupsPrintersTitle}"
search-label="$i18n{searchLabel}"
search-term="{{searchTerm}}">
<settings-cups-printers search-term="{{searchTerm}}"
prefs="[[prefs]]">
</settings-cups-printers>
</settings-subpage>
</template>
</if>
<template is="dom-if" route-path="/cloudPrinters">
<settings-subpage
associated-control="[[$$('#cloudPrinters')]]"
......
chrome/browser/resources/settings/printing_page/printing_page.js
View file @ 9e8fca7f
......@@ -24,34 +24,10 @@ Polymer({
if (settings.routes.CLOUD_PRINTERS) {
map.set(settings.routes.CLOUD_PRINTERS.path, '#cloudPrinters');
}
// <if expr="chromeos">
if (settings.routes.CUPS_PRINTERS) {
map.set(settings.routes.CUPS_PRINTERS.path, '#cupsPrinters');
}
// </if>
return map;
},
},
// <if expr="chromeos">
/**
* TODO(crbug.com/950007): Remove when SplitSettings is the default because
* CUPS printers will exist only in the OS settings page.
* @private
*/
showCupsPrinters_: {
type: Boolean,
value: () => loadTimeData.getBoolean('showOSSettings'),
}
// </if>
},
// <if expr="chromeos">
/** @private */
onTapCupsPrinters_: function() {
settings.navigateTo(settings.routes.CUPS_PRINTERS);
},
// </if>
// <if expr="not chromeos">
onTapLocalPrinters_: function() {
......
chrome/browser/resources/settings/settings_resources.grd
View file @ 9e8fca7f
......@@ -798,83 +798,6 @@
file="printing_page/printing_page.js"
preprocess="true"
type="chrome_html" />
<if expr="chromeos">
<structure name="IDR_SETTINGS_CUPS_PRINTER_TYPES_HTML"
file="printing_page/cups_printer_types.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTER_TYPES_JS"
file="printing_page/cups_printer_types.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTER_SHARED_CSS_HTML"
file="printing_page/cups_printer_shared_css.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTING_PAGE_HTML"
file="printing_page/cups_printers.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTING_PAGE_JS"
file="printing_page/cups_printers.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_BROWSER_PROXY_HTML"
file="printing_page/cups_printers_browser_proxy.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_BROWSER_PROXY_JS"
file="printing_page/cups_printers_browser_proxy.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_ENTRY_HTML"
file="printing_page/cups_printers_entry.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_ENTRY_JS"
file="printing_page/cups_printers_entry.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_ENTRY_LIST_BEHAVIOR_HTML"
file="printing_page/cups_printers_entry_list_behavior.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_ENTRY_LIST_BEHAVIOR_JS"
file="printing_page/cups_printers_entry_list_behavior.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_ENTRY_MANAGER_HTML"
file="printing_page/cups_printers_entry_manager.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTERS_ENTRY_MANAGER_JS"
file="printing_page/cups_printers_entry_manager.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_SAVED_PRINTERS_HTML"
file="printing_page/cups_saved_printers.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_SAVED_PRINTERS_JS"
file="printing_page/cups_saved_printers.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_NEARBY_PRINTERS_HTML"
file="printing_page/cups_nearby_printers.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_NEARBY_PRINTERS_JS"
file="printing_page/cups_nearby_printers.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_EDIT_PRINTER_DIALOG_HTML"
file="printing_page/cups_edit_printer_dialog.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_EDIT_PRINTER_DIALOG_JS"
file="printing_page/cups_edit_printer_dialog.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_ADD_PRINTER_DIALOG_HTML"
file="printing_page/cups_add_printer_dialog.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_ADD_PRINTER_DIALOG_JS"
file="printing_page/cups_add_printer_dialog.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_ADD_PRINTER_DIALOG_ELEMENTS_HTML"
file="printing_page/cups_add_printer_dialog_elements.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_ADD_PRINTER_DIALOG_ELEMENTS_JS"
file="printing_page/cups_add_printer_dialog_elements.js"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTER_DIALOG_UTIL_HTML"
file="printing_page/cups_printer_dialog_util.html"
type="chrome_html" />
<structure name="IDR_SETTINGS_CUPS_PRINTER_DIALOG_UTIL_JS"
file="printing_page/cups_printer_dialog_util.js"
type="chrome_html" />
</if>
<if expr="not chromeos">
<structure name="IDR_SETTINGS_PRINTING_BROWSER_PROXY_HTML"
file="printing_page/printing_browser_proxy.html"
......
chrome/test/data/webui/settings/chromeos/cups_printer_page_tests.js
View file @ 9e8fca7f
......@@ -565,7 +565,9 @@ suite('CupsAddPrinterDialogTests', function() {
Polymer.dom.flush();
const eulaLink = 'google';
const expectedEulaLink = 'chrome://os-settings/' + eulaLink;
const path = window.location.pathname;
const expectedEulaLink = window.location.origin +
path.slice(0, path.lastIndexOf('/') + 1) + eulaLink;
const expectedManufacturer = 'Google';
const expectedModel = 'printer';
const expectedModel2 = 'newPrinter';
......
chrome/test/data/webui/settings/chromeos/os_settings_browsertest.js
View file @ 9e8fca7f
......@@ -925,7 +925,8 @@ TEST_F('OSSettingsPluginVmPageTest', 'AllJsTests', () => {
var OSSettingsPrinterEntryTest = class extends OSSettingsBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'printing_page/cups_printers_entry.html';
return super.browsePreload +
'chromeos/os_printing_page/cups_printers_entry.html';
}
/** @override */
......@@ -948,7 +949,7 @@ TEST_F('OSSettingsPrinterEntryTest', 'AllJsTests', () => {
var OSSettingsPrinterLandingPageTest = class extends OSSettingsBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'printing_page/cups_printers.html';
return super.browsePreload + 'chromeos/os_printing_page/cups_printers.html';
}
/** @override */
......@@ -975,7 +976,7 @@ TEST_F('OSSettingsPrinterLandingPageTest', 'AllJsTests', () => {
var OSSettingsPrintingPageTest = class extends OSSettingsBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'printing_page/cups_printers.html';
return super.browsePreload + 'chromeos/os_printing_page/cups_printers.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