Added options to disable specific printers.

chrome/service/cloud_print/cloud_print_connector.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/service/cloud_print/cloud_print_connector.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/md5.h"
 #include "base/rand_util.h"
@@ skipping 70 matching lines @@
   DCHECK(printer_ids);
   printer_ids->clear();
   for (JobHandlerMap::const_iterator iter = job_handler_map_.begin();
        iter != job_handler_map_.end(); ++iter) {
     printer_ids->push_back(iter->first);
   }
 }
 
 void CloudPrintConnector::RegisterPrinters(
     const printing::PrinterList& printers) {
-  if (!IsRunning())
+  if (!settings_.connect_new_printers() || !IsRunning())
     return;
   printing::PrinterList::const_iterator it;
   for (it = printers.begin(); it != printers.end(); ++it) {
-    AddPendingRegisterTask(*it);
+    if (!settings_.IsPrinterBlacklisted(it->printer_name))
+      AddPendingRegisterTask(*it);
   }
 }
 
 // Check for jobs for specific printer
 void CloudPrintConnector::CheckForJobs(const std::string& reason,
                                        const std::string& printer_id) {
   if (!IsRunning())
     return;
   if (!printer_id.empty()) {
     JobHandlerMap::iterator index = job_handler_map_.find(printer_id);
@@ skipping 95 matching lines @@
   // Go through the list of the cloud printers and init print job handlers.
   ListValue* printer_list = NULL;
   // There may be no "printers" value in the JSON
   if (json_data->GetList(cloud_print::kPrinterListValue, &printer_list)
       && printer_list) {
     for (size_t index = 0; index < printer_list->GetSize(); index++) {
       DictionaryValue* printer_data = NULL;
       if (printer_list->GetDictionary(index, &printer_data)) {
         std::string printer_name;
         printer_data->GetString(kNameValue, &printer_name);
-        if (RemovePrinterFromList(printer_name, &local_printers)) {
+        std::string printer_id;
+        printer_data->GetString(kIdValue, &printer_id);
+        if (settings_.IsPrinterBlacklisted(printer_name)) {
+          VLOG(1) << "CP_CONNECTOR: Deleting " << printer_name <<
+              " id: " << printer_id << " as blacklisted";
+          AddPendingDeleteTask(printer_id);
+        } else if (RemovePrinterFromList(printer_name, &local_printers)) {
           InitJobHandlerForPrinter(printer_data);
         } else {
           // Cloud printer is not found on the local system.
-          std::string printer_id;
-          printer_data->GetString(kIdValue, &printer_id);
           if (full_list || settings_.delete_on_enum_fail()) {
             // Delete if we get the full list of printers or
             // |delete_on_enum_fail_| is set.
             VLOG(1) << "CP_CONNECTOR: Deleting " << printer_name <<
-              " id: " << printer_id <<
-              " full_list: " << full_list <<
-              " delete_on_enum_fail: " << settings_.delete_on_enum_fail();
+                " id: " << printer_id <<
+                " full_list: " << full_list <<
+                " delete_on_enum_fail: " << settings_.delete_on_enum_fail();
             AddPendingDeleteTask(printer_id);
           } else {
             LOG(ERROR) << "CP_CONNECTOR: Printer: " << printer_name <<
                 " id: " << printer_id <<
                 " not found in print system and full printer list was" <<
                 " not received.  Printer will not be able to process" <<
                 " jobs.";
           }
         }
       } else {
         NOTREACHED();
       }
     }
   }
 
   request_ = NULL;
-  if (!local_printers.empty()) {
-    // In the future we might want to notify frontend about available printers
-    // and let user choose which printers to register.
-    // Here is a good place to notify client about available printers.
-    RegisterPrinters(local_printers);
-  }
+
+  RegisterPrinters(local_printers);
   ContinuePendingTaskProcessing();  // Continue processing background tasks.
   return CloudPrintURLFetcher::STOP_PROCESSING;
 }
 
 CloudPrintURLFetcher::ResponseAction
 CloudPrintConnector::HandlePrinterDeleteResponse(
     const net::URLFetcher* source,
     const GURL& url,
     DictionaryValue* json_data,
     bool succeeded) {
@@ skipping 303 matching lines @@
                    kCloudPrintAPIMaxRetryCount,
                    mime_type,
                    post_data,
                    &CloudPrintConnector::HandleRegisterPrinterResponse);
 }
 
 bool CloudPrintConnector::IsSamePrinter(const std::string& name1,
                                         const std::string& name2) const {
   return (0 == base::strcasecmp(name1.c_str(), name2.c_str()));
 }