diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 03:01:54 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 03:01:54 +0000 |
| commit | 39e8c48020b4b985e9314838ca1270410e328b61 (patch) | |
| tree | 4560bfd3643832e90e8173f46ee3624df428c441 /chrome/service | |
| parent | c56428f24b67efa6a2eff77a709b7b6489403617 (diff) | |
| download | chromium_src-39e8c48020b4b985e9314838ca1270410e328b61.zip chromium_src-39e8c48020b4b985e9314838ca1270410e328b61.tar.gz chromium_src-39e8c48020b4b985e9314838ca1270410e328b61.tar.bz2 | |
Combined both constructors of TalkMediatorImpl into one.
BUG=none
TEST=manual, trybots
Review URL: http://codereview.chromium.org/2835003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/cloud_print/cloud_print_proxy_backend.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index 719ecb5..f910a87 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -12,6 +12,7 @@ #include "chrome/service/cloud_print/cloud_print_consts.h" #include "chrome/service/cloud_print/cloud_print_helpers.h" #include "chrome/service/cloud_print/printer_job_handler.h" +#include "chrome/common/net/notifier/listener/mediator_thread_impl.h" #include "chrome/common/net/notifier/listener/talk_mediator_impl.h" #include "chrome/service/gaia/service_gaia_authenticator.h" #include "chrome/service/net/service_network_change_notifier_thread.h" @@ -286,8 +287,14 @@ void CloudPrintProxyBackend::Core::DoInitializeWithToken( // TODO(sanjeevr): Validate the tokens. auth_token_ = cloud_print_token; + + const bool kInitializeSsl = true; + const bool kConnectImmediately = false; + const bool kInvalidateXmppAuthToken = false; talk_mediator_.reset(new notifier::TalkMediatorImpl( - g_service_process->network_change_notifier_thread(), false)); + new notifier::MediatorThreadImpl( + g_service_process->network_change_notifier_thread()), + kInitializeSsl, kConnectImmediately, kInvalidateXmppAuthToken)); talk_mediator_->AddSubscribedServiceUrl(kCloudPrintTalkServiceUrl); talk_mediator_->SetDelegate(this); talk_mediator_->SetAuthToken(email, cloud_print_xmpp_token, |