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

Side by Side Diff: sync/internal_api/sync_manager_impl.h

Issue 10829086: Reland 148792 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/engine/syncer.cc ('k') | sync/internal_api/sync_manager_impl.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 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_ 5 #ifndef SYNC_INTERNAL_API_SYNC_MANAGER_H_
6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_ 6 #define SYNC_INTERNAL_API_SYNC_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
172 // Called only by our NetworkChangeNotifier. 172 // Called only by our NetworkChangeNotifier.
173 virtual void OnIPAddressChanged() OVERRIDE; 173 virtual void OnIPAddressChanged() OVERRIDE;
174 174
175 const SyncScheduler* scheduler() const; 175 const SyncScheduler* scheduler() const;
176 176
177 private: 177 private:
178 friend class SyncManagerTest; 178 friend class SyncManagerTest;
179 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, NudgeDelayTest); 179 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, NudgeDelayTest);
180 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnNotificationStateChange); 180 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnNotificationStateChange);
181 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnIncomingNotification); 181 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, OnIncomingNotification);
182 FRIEND_TEST_ALL_PREFIXES(SyncManagerTest, PurgeDisabledTypes);
182 183
183 struct NotificationInfo { 184 struct NotificationInfo {
184 NotificationInfo(); 185 NotificationInfo();
185 ~NotificationInfo(); 186 ~NotificationInfo();
186 187
187 int total_count; 188 int total_count;
188 std::string payload; 189 std::string payload;
189 190
190 // Returned pointer owned by the caller. 191 // Returned pointer owned by the caller.
191 DictionaryValue* ToValue() const; 192 DictionaryValue* ToValue() const;
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 // conflict resolver) updated the nigori's encryption keys in this chrome 400 // conflict resolver) updated the nigori's encryption keys in this chrome
400 // instantiation. 401 // instantiation.
401 int nigori_overwrite_count_; 402 int nigori_overwrite_count_;
402 403
403 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl); 404 DISALLOW_COPY_AND_ASSIGN(SyncManagerImpl);
404 }; 405 };
405 406
406 } // namespace syncer 407 } // namespace syncer
407 408
408 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_ 409 #endif // SYNC_INTERNAL_API_SYNC_MANAGER_H_
OLDNEW
« no previous file with comments | « sync/engine/syncer.cc ('k') | sync/internal_api/sync_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698