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 e5950de68e908ec67b3d611345ba67483f52e021..2bb3a84a8529ce5e8ae0e09f730626ab81659324 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 |
@@ -5,49 +5,114 @@ |
#include "chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h" |
#include <string> |
-#include "base/values.h" |
-#include "chrome/browser/extensions/extension_service.h" |
+ |
+#include "base/threading/sequenced_worker_pool.h" |
#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" |
#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h" |
-#include "chrome/browser/profiles/profile.h" |
- |
-namespace { |
+#include "chrome/common/extensions/api/cloud_print_private.h" |
+#include "net/base/net_util.h" |
+#include "printing/backend/print_backend.h" |
-bool test_mode = false; |
-} // namespace |
namespace extensions { |
-CloudPrintSetCredentialsFunction::CloudPrintSetCredentialsFunction() { |
+CloudPrintTestsDelegate* CloudPrintTestsDelegate::instance_ = NULL; |
+ |
+CloudPrintTestsDelegate* CloudPrintTestsDelegate::instance() { |
+ return instance_; |
+} |
+ |
+CloudPrintTestsDelegate::CloudPrintTestsDelegate() { |
+ instance_ = this; |
+} |
+ |
+CloudPrintTestsDelegate::~CloudPrintTestsDelegate() { |
+ instance_ = NULL; |
+} |
+ |
+CloudPrintSetupConnectorFunction::CloudPrintSetupConnectorFunction() { |
} |
-CloudPrintSetCredentialsFunction::~CloudPrintSetCredentialsFunction() { |
+CloudPrintSetupConnectorFunction::~CloudPrintSetupConnectorFunction() { |
} |
-bool CloudPrintSetCredentialsFunction::RunImpl() { |
- std::string user_email; |
- EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &user_email)); |
- std::string robot_email; |
- EXTENSION_FUNCTION_VALIDATE(args_->GetString(1, &robot_email)); |
- std::string credentials; |
- EXTENSION_FUNCTION_VALIDATE(args_->GetString(2, &credentials)); |
- if (test_mode) { |
- std::string test_response = user_email; |
- test_response.append(robot_email); |
- test_response.append(credentials); |
- SetResult(Value::CreateStringValue(test_response)); |
+ |
+bool CloudPrintSetupConnectorFunction::RunImpl() { |
+ using extensions::api::cloud_print_private::SetupConnector::Params; |
+ scoped_ptr<Params> params(Params::Create(*args_)); |
+ if (CloudPrintTestsDelegate::instance()) { |
+ CloudPrintTestsDelegate::instance()->SetupConnector( |
+ params->user_email, |
+ params->robot_email, |
+ params->credentials, |
+ params->connect_new_printers, |
+ params->printer_blacklist); |
} else { |
CloudPrintProxyServiceFactory::GetForProfile(profile_)-> |
- EnableForUserWithRobot(credentials, robot_email, user_email); |
+ EnableForUserWithRobot(params->credentials, |
+ params->robot_email, |
+ params->user_email, |
+ params->connect_new_printers, |
+ params->printer_blacklist); |
} |
SendResponse(true); |
return true; |
} |
-// static |
-void CloudPrintSetCredentialsFunction::SetTestMode(bool test_mode_enabled) { |
- test_mode = test_mode_enabled; |
+CloudPrintGetHostNameFunction::CloudPrintGetHostNameFunction() { |
+} |
+ |
+CloudPrintGetHostNameFunction::~CloudPrintGetHostNameFunction() { |
+} |
+ |
+bool CloudPrintGetHostNameFunction::RunImpl() { |
+ SetResult(Value::CreateStringValue( |
+ CloudPrintTestsDelegate::instance() ? |
+ CloudPrintTestsDelegate::instance()->GetHostName() : |
+ net::GetHostName())); |
+ SendResponse(true); |
+ return true; |
+} |
+ |
+CloudPrintGetPrintersFunction::CloudPrintGetPrintersFunction() { |
+} |
+ |
+CloudPrintGetPrintersFunction::~CloudPrintGetPrintersFunction() { |
+} |
+ |
+void CloudPrintGetPrintersFunction::ReturnResult( |
+ const base::ListValue* printers) { |
+ SetResult(printers->DeepCopy()); |
+ SendResponse(true); |
+} |
+ |
+void CloudPrintGetPrintersFunction::CollectPrinters() { |
+ scoped_ptr<base::ListValue> result(new base::ListValue()); |
+ if (CloudPrintTestsDelegate::instance()) { |
+ std::vector<std::string> printers = |
+ CloudPrintTestsDelegate::instance()->GetPrinters(); |
+ for (size_t i = 0; i < printers.size(); ++i) |
+ result->Append(Value::CreateStringValue(printers[i])); |
+ } else { |
+ printing::PrinterList printers; |
+ scoped_refptr<printing::PrintBackend> backend( |
+ printing::PrintBackend::CreateInstance(NULL)); |
+ if (backend) |
+ backend->EnumeratePrinters(&printers); |
+ for (size_t i = 0; i < printers.size(); ++i) |
+ result->Append(Value::CreateStringValue(printers[i].printer_name)); |
+ } |
+ content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE, |
+ base::Bind(&CloudPrintGetPrintersFunction::ReturnResult, this, |
+ base::Owned(result.release()))); |
+} |
+ |
+ |
+bool CloudPrintGetPrintersFunction::RunImpl() { |
+ content::BrowserThread::GetBlockingPool()->PostTask(FROM_HERE, |
+ base::Bind(&CloudPrintGetPrintersFunction::CollectPrinters, this)); |
+ return true; |
} |
} // namespace extensions |