| Index: chrome/service/cloud_print/cloud_print_proxy.cc
|
| diff --git a/chrome/service/cloud_print/cloud_print_proxy.cc b/chrome/service/cloud_print/cloud_print_proxy.cc
|
| index 81f9114f2940fcefbb5efbaee6987302a88c85cb..f4db88382dce992a34ce4a38759945ffd463a865 100644
|
| --- a/chrome/service/cloud_print/cloud_print_proxy.cc
|
| +++ b/chrome/service/cloud_print/cloud_print_proxy.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/process_util.h"
|
| #include "base/values.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "chrome/common/cloud_print/cloud_print_helpers.h"
|
| #include "chrome/common/cloud_print/cloud_print_proxy_info.h"
|
| #include "chrome/common/net/gaia/gaia_oauth_client.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -140,7 +141,7 @@ bool CloudPrintProxy::CreateBackend() {
|
|
|
| service_prefs_->GetString(prefs::kCloudPrintProxyId, &proxy_id_);
|
| if (proxy_id_.empty()) {
|
| - proxy_id_ = cloud_print::PrintSystem::GenerateProxyId();
|
| + proxy_id_ = cloud_print::GenerateProxyId();
|
| service_prefs_->SetString(prefs::kCloudPrintProxyId, proxy_id_);
|
| service_prefs_->WritePrefs();
|
| }
|
| @@ -154,9 +155,8 @@ bool CloudPrintProxy::CreateBackend() {
|
| std::string cloud_print_server_url_str;
|
| service_prefs_->GetString(prefs::kCloudPrintServiceURL,
|
| &cloud_print_server_url_str);
|
| - if (cloud_print_server_url_str.empty()) {
|
| + if (cloud_print_server_url_str.empty())
|
| cloud_print_server_url_str = kDefaultCloudPrintServerUrl;
|
| - }
|
|
|
| // By default we don't poll for jobs when we lose XMPP connection. But this
|
| // behavior can be overridden by a preference.
|
| @@ -166,7 +166,7 @@ bool CloudPrintProxy::CreateBackend() {
|
|
|
| // TODO(sanjeevr): Allow overriding OAuthClientInfo in prefs.
|
| gaia::OAuthClientInfo oauth_client_info;
|
| - oauth_client_info.client_id = kDefaultCloudPrintOAuthClientId;
|
| + oauth_client_info.client_id = cloud_print::kDefaultCloudPrintOAuthClientId;
|
| oauth_client_info.client_secret = kDefaultCloudPrintOAuthClientSecret;
|
|
|
| GURL cloud_print_server_url(cloud_print_server_url_str.c_str());
|
|
|