1 files changed, 12 insertions, 1 deletions
diff --git a/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h b/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
index 0f9452af13e..447eecb1d69 100644
--- a/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
+++ b/chromium/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
@@ -12,6 +12,7 @@
 
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
+#include "base/scoped_observer.h"
 #include "chrome/browser/chromeos/printing/cups_printers_manager.h"
 #include "chrome/browser/chromeos/printing/printer_configurer.h"
 #include "chrome/browser/chromeos/printing/printer_event_tracker.h"
@@ -125,6 +126,9 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
       const std::string& manufacturer,
       const std::string& model);
 
+  // Emits the updated discovered printer list after new printers are received.
+  void UpdateDiscoveredPrinters();
+
   // Attempt to add a discovered printer.
   void HandleAddDiscoveredPrinter(const base::ListValue* args);
 
@@ -152,6 +156,10 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
   void VerifyPpdContents(const base::FilePath& path,
                          const std::string& contents);
 
+  // Fires the on-manually-add-discovered-printer event with the appropriate
+  // parameters.  See https://crbug.com/835476
+  void FireManuallyAddDiscoveredPrinter(const Printer& printer);
+
   Profile* profile_;
 
   // Discovery support.  discovery_active_ tracks whether or not the UI
@@ -174,7 +182,10 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
 
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
   std::string webui_callback_id_;
-  std::unique_ptr<CupsPrintersManager> printers_manager_;
+  CupsPrintersManager* printers_manager_;
+
+  ScopedObserver<CupsPrintersManager, CupsPrintersManager::Observer>
+      printers_manager_observer_;
 
   base::WeakPtrFactory<CupsPrintersHandler> weak_factory_;