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

chrome/browser/printing/cloud_print/cloud_print_proxy_service.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_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_PROXY_SERVICE_H_
 #define CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_PROXY_SERVICE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 24 matching lines @@
   // Initializes the object. This should be called every time an object of this
   // class is constructed.
   void Initialize();
 
   // Enables/disables cloud printing for the user
   virtual void EnableForUser(const std::string& lsid, const std::string& email);
   virtual void EnableForUserWithRobot(
       const std::string& robot_auth_code,
       const std::string& robot_email,
       const std::string& user_email,
-      bool connect_new_printers,
-      const std::vector<std::string>& printer_blacklist);
+      const base::DictionaryValue& user_settings);
   virtual void DisableForUser();
 
   // Query the service process for the status of the cloud print proxy and
   // update the browser prefs.
   void RefreshStatusFromService();
 
   // Disable the service if the policy to do so is set, and once the
   // disablement is verified, quit the browser. Returns true if the policy is
   // not set or the connector was not enabled.
   bool EnforceCloudPrintConnectorPolicyAndQuit();
 
   std::string proxy_id() const { return proxy_id_; }
 
   // CloudPrintSetupHandler::Delegate implementation.
   virtual void OnCloudPrintSetupClosed() OVERRIDE;
 
   // Returns list of printer names available for registration.
   static void GetPrintersAvalibleForRegistration(
       std::vector<std::string>* printers);
 
  private:
   // NotificationDelegate implementation for the token expired notification.
   class TokenExpiredNotificationDelegate;
   friend class TokenExpiredNotificationDelegate;
 
-  Profile* profile_;
-  std::string proxy_id_;
-
   // Methods that send an IPC to the service.
   void RefreshCloudPrintProxyStatus();
   void EnableCloudPrintProxy(const std::string& lsid, const std::string& email);
   void EnableCloudPrintProxyWithRobot(
       const std::string& robot_auth_code,
       const std::string& robot_email,
       const std::string& user_email,
-      bool connect_new_printers,
-      const std::vector<std::string>& printer_blacklist);
+      const base::DictionaryValue* user_preferences);
   void DisableCloudPrintProxy();
 
   // Callback that gets the cloud print proxy info.
   void ProxyInfoCallback(
     const cloud_print::CloudPrintProxyInfo& proxy_info);
 
   // Invoke a task that gets run after the service process successfully
   // launches. The task typically involves sending an IPC to the service
   // process.
   bool InvokeServiceTask(const base::Closure& task);
 
   // Checks the policy. Returns true if nothing needs to be done (the policy is
   // not set or the connector is not enabled).
   bool ApplyCloudPrintConnectorPolicy();
 
+  Profile* profile_;
+  std::string proxy_id_;
+
   // Virtual for testing.
   virtual ServiceProcessControl* GetServiceProcessControl();
 
   base::WeakPtrFactory<CloudPrintProxyService> weak_factory_;
 
-  // For watching for connector enablement policy changes.
+  // For watching for connector policy changes.
   PrefChangeRegistrar pref_change_registrar_;
 
   // If set, continue trying to disable the connector, and quit the process
   // once successful.
   bool enforcing_connector_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPrintProxyService);
 };
 
 #endif  // CHROME_BROWSER_PRINTING_CLOUD_PRINT_CLOUD_PRINT_PROXY_SERVICE_H_