| Index: chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
|
| diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
|
| index 7c4343ed323c299fbcedbfaa800f95bed0f24308..e055e592a27274d865dea80486382bc145393b3a 100644
|
| --- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
|
| +++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
|
| @@ -29,6 +29,7 @@ CloudPrintTestsDelegate::~CloudPrintTestsDelegate() {
|
| instance_ = NULL;
|
| }
|
|
|
| +
|
| CloudPrintPrivateSetupConnectorFunction::
|
| CloudPrintPrivateSetupConnectorFunction() {
|
| }
|
| @@ -46,17 +47,17 @@ bool CloudPrintPrivateSetupConnectorFunction::RunImpl() {
|
| params->user_email,
|
| params->robot_email,
|
| params->credentials,
|
| - params->connect_new_printers,
|
| - params->printer_blacklist);
|
| + params->user_settings);
|
| } else {
|
| if (!CloudPrintProxyServiceFactory::GetForProfile(profile_))
|
| return false;
|
| + scoped_ptr<base::DictionaryValue> user_setings(
|
| + params->user_settings.ToValue());
|
| CloudPrintProxyServiceFactory::GetForProfile(profile_)->
|
| EnableForUserWithRobot(params->credentials,
|
| params->robot_email,
|
| params->user_email,
|
| - params->connect_new_printers,
|
| - params->printer_blacklist);
|
| + *user_setings);
|
| }
|
| SendResponse(true);
|
| return true;
|
|
|