1 files changed, 12 insertions, 5 deletions

diff --git a/chromium/chrome/browser/resources/settings/printing_page/cups_printers.js b/chromium/chrome/browser/resources/settings/printing_page/cups_printers.js
index 21109350ab6..ece618460ad 100644
--- a/chromium/chrome/browser/resources/settings/printing_page/cups_printers.js
+++ b/chromium/chrome/browser/resources/settings/printing_page/cups_printers.js
@@ -81,11 +81,16 @@ Polymer({
   /** @private {?chromeos.networkConfig.mojom.CrosNetworkConfigRemote} */
   networkConfig_: null,
 
+  /** @private {settings.printing.CupsPrintersEntryManager} */
+  entryManager_: null,
+
   /** @override */
   created: function() {
     this.networkConfig_ =
         network_config.MojoInterfaceProviderImpl.getInstance()
             .getMojoServiceRemote();
+    this.entryManager_ =
+        settings.printing.CupsPrintersEntryManager.getInstance();
   },
 
   /** @override */
@@ -94,7 +99,7 @@ Polymer({
         .getNetworkStateList({
           filter: chromeos.networkConfig.mojom.FilterType.kActive,
           networkType: chromeos.networkConfig.mojom.NetworkType.kAll,
-          limit: chromeos.networkConfig.mojom.kNoLimit,
+          limit: chromeos.networkConfig.mojom.NO_LIMIT,
         })
         .then((responseParams) => {
           this.onActiveNetworksChanged(responseParams.result);
@@ -110,7 +115,6 @@ Polymer({
     this.updateCupsPrintersList_();
   },
 
-
   /**
    * settings.RouteObserverBehavior
    * @param {!settings.Route} route
@@ -119,10 +123,14 @@ Polymer({
   currentRouteChanged: function(route) {
     if (route != settings.routes.CUPS_PRINTERS) {
       cr.removeWebUIListener('on-printers-changed');
+      this.entryManager_.removeWebUIListeners();
       return;
     }
+
+    this.entryManager_.addWebUIListeners();
     cr.addWebUIListener(
         'on-printers-changed', this.onPrintersChanged_.bind(this));
+    this.updateCupsPrintersList_();
   },
 
   /**
@@ -148,17 +156,15 @@ Polymer({
    * }>} event
    * @private
    */
-   openResultToast_: function(event) {
+  openResultToast_: function(event) {
     const printerName = event.detail.printerName;
     switch (event.detail.resultCode) {
       case PrinterSetupResult.SUCCESS:
-        this.updateCupsPrintersList_();
         this.addPrinterResultText_ =
             loadTimeData.getStringF('printerAddedSuccessfulMessage',
                                     printerName);
         break;
       case PrinterSetupResult.EDIT_SUCCESS:
-        this.updateCupsPrintersList_();
         this.addPrinterResultText_ =
             loadTimeData.getStringF('printerEditedSuccessfulMessage',
                                     printerName);
@@ -203,6 +209,7 @@ Polymer({
           printer => /** @type {!PrinterListEntry} */({
               printerInfo: printer,
               printerType: PrinterType.SAVED}));
+      this.entryManager_.setSavedPrintersList(this.savedPrinters_);
     } else {
       this.printers = cupsPrintersList.printerList;
     }