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

Side by Side Diff: sync/engine/update_applicator.h

Issue 1181713004: Remove base/port.h includes that are not necessary anymore. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix win build Created 5 years, 6 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
« no previous file with comments | « sync/engine/net/url_translator.cc ('k') | no next file » | 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 // An UpdateApplicator is used to iterate over a number of unapplied updates, 5 // An UpdateApplicator is used to iterate over a number of unapplied updates,
6 // applying them to the client using the given syncer session. 6 // applying them to the client using the given syncer session.
7 // 7 //
8 // UpdateApplicator might resemble an iterator, but it actually keeps retrying 8 // UpdateApplicator might resemble an iterator, but it actually keeps retrying
9 // failed updates until no remaining updates can be successfully applied. 9 // failed updates until no remaining updates can be successfully applied.
10 10
11 #ifndef SYNC_ENGINE_UPDATE_APPLICATOR_H_ 11 #ifndef SYNC_ENGINE_UPDATE_APPLICATOR_H_
12 #define SYNC_ENGINE_UPDATE_APPLICATOR_H_ 12 #define SYNC_ENGINE_UPDATE_APPLICATOR_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/basictypes.h" 16 #include "base/basictypes.h"
17 #include "base/port.h"
18 #include "sync/internal_api/public/engine/model_safe_worker.h" 17 #include "sync/internal_api/public/engine/model_safe_worker.h"
19 #include "sync/syncable/syncable_id.h" 18 #include "sync/syncable/syncable_id.h"
20 #include "sync/sessions/status_controller.h" 19 #include "sync/sessions/status_controller.h"
21 20
22 namespace syncer { 21 namespace syncer {
23 22
24 namespace sessions { 23 namespace sessions {
25 class StatusController; 24 class StatusController;
26 } 25 }
27 26
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 68
70 int updates_applied_; 69 int updates_applied_;
71 int encryption_conflicts_; 70 int encryption_conflicts_;
72 int hierarchy_conflicts_; 71 int hierarchy_conflicts_;
73 std::set<syncable::Id> simple_conflict_ids_; 72 std::set<syncable::Id> simple_conflict_ids_;
74 }; 73 };
75 74
76 } // namespace syncer 75 } // namespace syncer
77 76
78 #endif // SYNC_ENGINE_UPDATE_APPLICATOR_H_ 77 #endif // SYNC_ENGINE_UPDATE_APPLICATOR_H_
OLDNEW
« no previous file with comments | « sync/engine/net/url_translator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698