Changed cloud print private API to pass all page settings as single object.

chrome/service/cloud_print/connector_settings.h

 // 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.
 
 #ifndef CHROME_SERVICE_CLOUD_PRINT_CONNECTOR_SETTINGS_H_
 #define CHROME_SERVICE_CLOUD_PRINT_CONNECTOR_SETTINGS_H_
 
-#include <set>
+#include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 
 class ServiceProcessPrefs;
 
 namespace base {
   class DictionaryValue;
 }
@@ skipping 14 matching lines @@
   };
 
   const std::string& proxy_id() const {
     return proxy_id_;
   }
 
   bool delete_on_enum_fail() const {
     return delete_on_enum_fail_;
   }
 
-  bool connect_new_printers() const {
-    return connect_new_printers_;
-  };
-
   bool xmpp_ping_enabled() const {
     return xmpp_ping_enabled_;
   }
 
   void set_xmpp_ping_enabled(bool enabled) {
     xmpp_ping_enabled_ = enabled;
   }
 
   int xmpp_ping_timeout_sec() const {
     return xmpp_ping_timeout_sec_;
   }
 
   const base::DictionaryValue* print_system_settings() const {
     return print_system_settings_.get();
   };
 
-  bool IsPrinterBlacklisted(const std::string& name) const;
+  bool ShouldConnect(const std::string& printer_name) const;
+  std::string GetDisplayName(const std::string& printer_name) const;
 
   void SetXmppPingTimeoutSec(int timeout);
 
  private:
   // Cloud Print server url.
   GURL server_url_;
 
   // This is initialized after a successful call to one of the Enable* methods.
   // It is not cleared in DisableUser.
   std::string proxy_id_;
 
   // If |true| printers that are not found locally will be deleted on GCP
   // even if the local enumeration failed.
   bool delete_on_enum_fail_;
 
   // If true register all new printers in cloud print.
   bool connect_new_printers_;
 
   // Indicate if XMPP pings are enabled.
   bool xmpp_ping_enabled_;
 
   // Indicate timeout between XMPP pings.
   int xmpp_ping_timeout_sec_;
 
-  // List of printers which should not be connected.
-  std::set<std::string> printer_blacklist_;
+  // Mapping from printer name to printer settings.
+  // Settings include bool value whether connect printer or not and
+  // display name.
+  typedef std::map<std::string, std::pair<bool, std::string> > Printers;
+  Printers printers_;
 
   // Print system settings.
   scoped_ptr<base::DictionaryValue> print_system_settings_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectorSettings);
 };
 
 }  // namespace cloud_print
 
 #endif  // CHROME_SERVICE_CLOUD_PRINT_CONNECTOR_SETTINGS_H_