chrome/service/cloud_print/cloud_print_proxy_backend.cc - Issue 11360151: Move common cloud print methods from service/cloud_print to common/cloud_print.

Unified Diff: chrome/service/cloud_print/cloud_print_proxy_backend.cc

Issue 11360151: Move common cloud print methods from service/cloud_print to common/cloud_print. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/service/cloud_print/cloud_print_helpers_unittest.cc ('K') | « chrome/service/cloud_print/cloud_print_helpers_unittest.cc ('k') | chrome/service/cloud_print/cloud_print_url_fetcher.cc » ('j') | chrome/service/cloud_print/cloud_print_url_fetcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/service/cloud_print/cloud_print_proxy_backend.cc

diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc

index 44df7b60d6adbcfadfe0461ca6a3e5b5a748a6fe..57214fb9c81f8a9dcf9ebcd6ad96a71bec384438 100644

--- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc

+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc

@@ -14,6 +14,7 @@

#include "base/rand_util.h"

#include "base/values.h"

#include "chrome/common/chrome_switches.h"

+#include "chrome/common/cloud_print/cloud_print_constants.h"

#include "chrome/service/cloud_print/cloud_print_auth.h"

#include "chrome/service/cloud_print/cloud_print_connector.h"

#include "chrome/service/cloud_print/cloud_print_consts.h"

msw 2012/11/17 00:22:30 ditto nit to remove this include if unused.

Chen Yu 2012/11/26 12:07:06 Done.

@@ -374,8 +375,8 @@ void CloudPrintProxyBackend::Core::InitNotifications(

push_client_ = notifier::PushClient::CreateDefault(notifier_options);

push_client_->AddObserver(this);

notifier::Subscription subscription;

- subscription.channel = kCloudPrintPushNotificationsSource;

- subscription.from = kCloudPrintPushNotificationsSource;

+ subscription.channel = cloud_print::kCloudPrintPushNotificationsSource;

msw 2012/11/17 00:22:30 ditto nit: put this file in the cloud_print namesp

Chen Yu 2012/11/26 12:07:06 Done.

+ subscription.from = cloud_print::kCloudPrintPushNotificationsSource;

push_client_->UpdateSubscriptions(

notifier::SubscriptionList(1, subscription));

push_client_->UpdateCredentials(robot_email, access_token);

@@ -566,7 +567,7 @@ void CloudPrintProxyBackend::Core::OnIncomingNotification(

DCHECK(MessageLoop::current() == backend_->core_thread_.message_loop());

VLOG(1) << "CP_CONNECTOR: Incoming notification.";

- if (0 == base::strcasecmp(kCloudPrintPushNotificationsSource,

+ if (0 == base::strcasecmp(cloud_print::kCloudPrintPushNotificationsSource,

notification.channel.c_str()))

HandlePrinterNotification(notification.data);

}