diff options
| -rw-r--r-- | chrome/service/cloud_print/cloud_print_consts.cc | 2 | ||||
| -rw-r--r-- | chrome/service/cloud_print/cloud_print_consts.h | 2 | ||||
| -rw-r--r-- | chrome/service/cloud_print/cloud_print_proxy_backend.cc | 21 |
3 files changed, 16 insertions, 9 deletions
diff --git a/chrome/service/cloud_print/cloud_print_consts.cc b/chrome/service/cloud_print/cloud_print_consts.cc index d248a10..c86e5ee 100644 --- a/chrome/service/cloud_print/cloud_print_consts.cc +++ b/chrome/service/cloud_print/cloud_print_consts.cc @@ -33,8 +33,8 @@ const char kDriverNameTagName[] = "drivername"; const char kDefaultCloudPrintServerUrl[] = "https://www.google.com/cloudprint"; -const char kCloudPrintTalkServiceUrl[] = "http://www.google.com/cloudprint"; const char kGaiaUrl[] = "https://www.google.com/accounts/ClientLogin"; const char kCloudPrintGaiaServiceId[] = "cloudprint"; const char kSyncGaiaServiceId[] = "chromiumsync"; +const char kCloudPrintPushNotificationsSource[] = "cloudprint.google.com"; diff --git a/chrome/service/cloud_print/cloud_print_consts.h b/chrome/service/cloud_print/cloud_print_consts.h index 71f9225..1211571 100644 --- a/chrome/service/cloud_print/cloud_print_consts.h +++ b/chrome/service/cloud_print/cloud_print_consts.h @@ -33,10 +33,10 @@ extern const char kTagsHashTagName[]; extern const char kLocationTagName[]; extern const char kDriverNameTagName[]; extern const char kDefaultCloudPrintServerUrl[]; -extern const char kCloudPrintTalkServiceUrl[]; extern const char kGaiaUrl[]; extern const char kCloudPrintGaiaServiceId[]; extern const char kSyncGaiaServiceId[]; +extern const char kCloudPrintPushNotificationsSource[]; // Max interval between retrying connection to the server const int64 kMaxRetryInterval = 5*60*1000; // 5 minutes in millseconds diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index cec765d..2d0a46f 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -18,13 +18,13 @@ #include "chrome/service/gaia/service_gaia_authenticator.h" #include "chrome/service/service_process.h" #include "jingle/notifier/base/notifier_options.h" -#include "jingle/notifier/listener/mediator_thread_impl.h" +#include "jingle/notifier/listener/push_notifications_thread.h" #include "jingle/notifier/listener/talk_mediator_impl.h" #include "googleurl/src/gurl.h" #include "net/url_request/url_request_status.h" -// The real guts of SyncBackendHost, to keep the public client API clean. +// The real guts of CloudPrintProxyBackend, to keep the public client API clean. class CloudPrintProxyBackend::Core : public base::RefCountedThreadSafe<CloudPrintProxyBackend::Core>, public URLFetcherDelegate, @@ -42,7 +42,7 @@ class CloudPrintProxyBackend::Core // // The Do* methods are the various entry points from CloudPrintProxyBackend // It calls us on a dedicated thread to actually perform synchronous - // (and potentially blocking) syncapi operations. + // (and potentially blocking) operations. // // Called on the CloudPrintProxyBackend core_thread_ to perform // initialization. When we are passed in an LSID we authenticate using that @@ -179,6 +179,9 @@ class CloudPrintProxyBackend::Core bool notifications_enabled_; // Indicates whether a task to poll for jobs has been scheduled. bool job_poll_scheduled_; + // The channel we are interested in receiving push notifications for. + // This is "cloudprint.google.com/proxy/<proxy_id>" + std::string push_notifications_channel_; DISALLOW_COPY_AND_ASSIGN(Core); }; @@ -319,9 +322,13 @@ void CloudPrintProxyBackend::Core::DoInitializeWithToken( const notifier::NotifierOptions kNotifierOptions; const bool kInvalidateXmppAuthToken = false; talk_mediator_.reset(new notifier::TalkMediatorImpl( - new notifier::MediatorThreadImpl(kNotifierOptions), + new notifier::PushNotificationsThread(kNotifierOptions, + kCloudPrintPushNotificationsSource), kInvalidateXmppAuthToken)); - talk_mediator_->AddSubscribedServiceUrl(kCloudPrintTalkServiceUrl); + push_notifications_channel_ = kCloudPrintPushNotificationsSource; + push_notifications_channel_.append("/proxy/"); + push_notifications_channel_.append(proxy_id); + talk_mediator_->AddSubscribedServiceUrl(push_notifications_channel_); talk_mediator_->SetDelegate(this); talk_mediator_->SetAuthToken(email, cloud_print_xmpp_token, kSyncGaiaServiceId); @@ -727,8 +734,8 @@ void CloudPrintProxyBackend::Core::OnIncomingNotification( const IncomingNotificationData& notification_data) { DCHECK(MessageLoop::current() == backend_->core_thread_.message_loop()); LOG(INFO) << "CP_PROXY: Incoming notification."; - if (0 == base::strcasecmp(kCloudPrintTalkServiceUrl, - notification_data.service_url.c_str())) { + if (0 == base::strcasecmp(push_notifications_channel_.c_str(), + notification_data.service_url.c_str())) { HandlePrinterNotification(notification_data.service_specific_data); } } |