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

chrome/service/cloud_print/connector_settings.h

Index: chrome/service/cloud_print/connector_settings.h
diff --git a/chrome/service/cloud_print/connector_settings.h b/chrome/service/cloud_print/connector_settings.h
index 94aa841b0227fd31aa11b5644c3da3608c722973..f80463b02391cbb9eb2f7d790396cc2c603c660d 100644
--- a/chrome/service/cloud_print/connector_settings.h
+++ b/chrome/service/cloud_print/connector_settings.h
@@ -5,7 +5,7 @@
 #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"
@@ -40,10 +40,6 @@ class ConnectorSettings {
     return delete_on_enum_fail_;
   }
 
-  bool connect_new_printers() const {
-    return connect_new_printers_;
-  };
-
   bool xmpp_ping_enabled() const {
     return xmpp_ping_enabled_;
   }
@@ -60,7 +56,8 @@ class ConnectorSettings {
     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);
 
@@ -85,8 +82,11 @@ class ConnectorSettings {
   // 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_;