| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync/notifier/invalidation_notifier.h" | 5 #include "chrome/browser/sync/notifier/invalidation_notifier.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop_proxy.h" | 8 #include "base/message_loop_proxy.h" |
| 9 #include "chrome/browser/sync/notifier/sync_notifier_observer.h" | 9 #include "chrome/browser/sync/notifier/sync_notifier_observer.h" |
| 10 #include "chrome/browser/sync/protocol/service_constants.h" | 10 #include "chrome/browser/sync/protocol/service_constants.h" |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 61 email, token, SYNC_SERVICE_NAME); | 61 email, token, SYNC_SERVICE_NAME); |
| 62 if (state_ >= CONNECTING) { | 62 if (state_ >= CONNECTING) { |
| 63 login_->UpdateXmppSettings(xmpp_client_settings); | 63 login_->UpdateXmppSettings(xmpp_client_settings); |
| 64 } else { | 64 } else { |
| 65 notifier::ConnectionOptions options; | 65 notifier::ConnectionOptions options; |
| 66 VLOG(1) << "First time updating credentials: connecting"; | 66 VLOG(1) << "First time updating credentials: connecting"; |
| 67 login_.reset( | 67 login_.reset( |
| 68 new notifier::Login(this, | 68 new notifier::Login(this, |
| 69 xmpp_client_settings, | 69 xmpp_client_settings, |
| 70 notifier::ConnectionOptions(), | 70 notifier::ConnectionOptions(), |
| 71 notifier_options_.request_context_getter-> | 71 notifier_options_.request_context_getter, |
| 72 GetURLRequestContext()->host_resolver(), | |
| 73 notifier_options_.request_context_getter-> | |
| 74 GetURLRequestContext()->cert_verifier(), | |
| 75 notifier::GetServerList(notifier_options_), | 72 notifier::GetServerList(notifier_options_), |
| 76 notifier_options_.try_ssltcp_first, | 73 notifier_options_.try_ssltcp_first, |
| 77 notifier_options_.auth_mechanism)); | 74 notifier_options_.auth_mechanism)); |
| 78 login_->StartConnection(); | 75 login_->StartConnection(); |
| 79 state_ = CONNECTING; | 76 state_ = CONNECTING; |
| 80 } | 77 } |
| 81 } | 78 } |
| 82 | 79 |
| 83 void InvalidationNotifier::UpdateEnabledTypes( | 80 void InvalidationNotifier::UpdateEnabledTypes( |
| 84 const syncable::ModelTypeSet& types) { | 81 const syncable::ModelTypeSet& types) { |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 OnNotificationStateChange(has_session)); | 124 OnNotificationStateChange(has_session)); |
| 128 } | 125 } |
| 129 | 126 |
| 130 void InvalidationNotifier::WriteState(const std::string& state) { | 127 void InvalidationNotifier::WriteState(const std::string& state) { |
| 131 DCHECK(non_thread_safe_.CalledOnValidThread()); | 128 DCHECK(non_thread_safe_.CalledOnValidThread()); |
| 132 VLOG(1) << "WriteState"; | 129 VLOG(1) << "WriteState"; |
| 133 FOR_EACH_OBSERVER(SyncNotifierObserver, observers_, StoreState(state)); | 130 FOR_EACH_OBSERVER(SyncNotifierObserver, observers_, StoreState(state)); |
| 134 } | 131 } |
| 135 | 132 |
| 136 } // namespace sync_notifier | 133 } // namespace sync_notifier |
| OLD | NEW |