Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Side by Side Diff: sync/notifier/invalidation_notifier.cc

Issue 10407014: Rename InvalidationVersionTracker to InvalidationStateTracker in preparation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 months 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « sync/notifier/invalidation_notifier.h ('k') | sync/notifier/invalidation_notifier_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "sync/notifier/invalidation_notifier.h" 5 #include "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 "jingle/notifier/base/const_communicator.h" 9 #include "jingle/notifier/base/const_communicator.h"
10 #include "jingle/notifier/base/notifier_options_util.h" 10 #include "jingle/notifier/base/notifier_options_util.h"
11 #include "net/url_request/url_request_context.h" 11 #include "net/url_request/url_request_context.h"
12 #include "sync/notifier/sync_notifier_observer.h" 12 #include "sync/notifier/sync_notifier_observer.h"
13 #include "sync/protocol/service_constants.h" 13 #include "sync/protocol/service_constants.h"
14 #include "sync/syncable/model_type_payload_map.h" 14 #include "sync/syncable/model_type_payload_map.h"
15 #include "talk/xmpp/jid.h" 15 #include "talk/xmpp/jid.h"
16 #include "talk/xmpp/xmppclientsettings.h" 16 #include "talk/xmpp/xmppclientsettings.h"
17 17
18 namespace sync_notifier { 18 namespace sync_notifier {
19 19
20 InvalidationNotifier::InvalidationNotifier( 20 InvalidationNotifier::InvalidationNotifier(
21 const notifier::NotifierOptions& notifier_options, 21 const notifier::NotifierOptions& notifier_options,
22 const InvalidationVersionMap& initial_max_invalidation_versions, 22 const InvalidationVersionMap& initial_max_invalidation_versions,
23 const browser_sync::WeakHandle<InvalidationVersionTracker>& 23 const browser_sync::WeakHandle<InvalidationStateTracker>&
24 invalidation_version_tracker, 24 invalidation_state_tracker,
25 const std::string& client_info) 25 const std::string& client_info)
26 : state_(STOPPED), 26 : state_(STOPPED),
27 notifier_options_(notifier_options), 27 notifier_options_(notifier_options),
28 initial_max_invalidation_versions_(initial_max_invalidation_versions), 28 initial_max_invalidation_versions_(initial_max_invalidation_versions),
29 invalidation_version_tracker_(invalidation_version_tracker), 29 invalidation_state_tracker_(invalidation_state_tracker),
30 client_info_(client_info) { 30 client_info_(client_info) {
31 DCHECK_EQ(notifier::NOTIFICATION_SERVER, 31 DCHECK_EQ(notifier::NOTIFICATION_SERVER,
32 notifier_options.notification_method); 32 notifier_options.notification_method);
33 DCHECK(notifier_options_.request_context_getter); 33 DCHECK(notifier_options_.request_context_getter);
34 // TODO(akalin): Replace NonThreadSafe checks with IO thread checks. 34 // TODO(akalin): Replace NonThreadSafe checks with IO thread checks.
35 DCHECK(notifier_options_.request_context_getter->GetIOMessageLoopProxy()-> 35 DCHECK(notifier_options_.request_context_getter->GetIOMessageLoopProxy()->
36 BelongsToCurrentThread()); 36 BelongsToCurrentThread());
37 } 37 }
38 38
39 InvalidationNotifier::~InvalidationNotifier() { 39 InvalidationNotifier::~InvalidationNotifier() {
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 DVLOG(1) << "OnConnect"; 106 DVLOG(1) << "OnConnect";
107 if (state_ >= STARTED) { 107 if (state_ >= STARTED) {
108 invalidation_client_.ChangeBaseTask(base_task); 108 invalidation_client_.ChangeBaseTask(base_task);
109 } else { 109 } else {
110 DVLOG(1) << "First time connecting: starting invalidation client with id " 110 DVLOG(1) << "First time connecting: starting invalidation client with id "
111 << invalidation_client_id_ << " and client info " 111 << invalidation_client_id_ << " and client info "
112 << client_info_; 112 << client_info_;
113 invalidation_client_.Start( 113 invalidation_client_.Start(
114 invalidation_client_id_, client_info_, invalidation_state_, 114 invalidation_client_id_, client_info_, invalidation_state_,
115 initial_max_invalidation_versions_, 115 initial_max_invalidation_versions_,
116 invalidation_version_tracker_, 116 invalidation_state_tracker_,
117 this, this, base_task); 117 this, this, base_task);
118 invalidation_state_.clear(); 118 invalidation_state_.clear();
119 state_ = STARTED; 119 state_ = STARTED;
120 } 120 }
121 } 121 }
122 122
123 void InvalidationNotifier::OnDisconnect() { 123 void InvalidationNotifier::OnDisconnect() {
124 DCHECK(non_thread_safe_.CalledOnValidThread()); 124 DCHECK(non_thread_safe_.CalledOnValidThread());
125 DVLOG(1) << "OnDisconnect"; 125 DVLOG(1) << "OnDisconnect";
126 } 126 }
(...skipping 11 matching lines...) Expand all
138 OnNotificationStateChange(has_session)); 138 OnNotificationStateChange(has_session));
139 } 139 }
140 140
141 void InvalidationNotifier::WriteState(const std::string& state) { 141 void InvalidationNotifier::WriteState(const std::string& state) {
142 DCHECK(non_thread_safe_.CalledOnValidThread()); 142 DCHECK(non_thread_safe_.CalledOnValidThread());
143 DVLOG(1) << "WriteState"; 143 DVLOG(1) << "WriteState";
144 FOR_EACH_OBSERVER(SyncNotifierObserver, observers_, StoreState(state)); 144 FOR_EACH_OBSERVER(SyncNotifierObserver, observers_, StoreState(state));
145 } 145 }
146 146
147 } // namespace sync_notifier 147 } // namespace sync_notifier
OLDNEW
« no previous file with comments | « sync/notifier/invalidation_notifier.h ('k') | sync/notifier/invalidation_notifier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698