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

Unified Diff: sync/sessions/status_controller.h

Issue 10696087: [Sync] Move ModelType and related classes to 'syncer' namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers, update copyrights Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sync/sessions/session_state_unittest.cc ('k') | sync/sessions/status_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/sessions/status_controller.h
diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h
index 0780a939f7cac6dfdef08df6a4c769d08d8fc518..85f3815a09c33bdb7db1970002414fb28754560c 100644
--- a/sync/sessions/status_controller.h
+++ b/sync/sessions/status_controller.h
@@ -68,10 +68,10 @@ class StatusController {
ModelSafeGroup group);
// ClientToServer messages.
- const syncable::ModelTypeSet updates_request_types() const {
+ const syncer::ModelTypeSet updates_request_types() const {
return model_neutral_.updates_request_types;
}
- void set_updates_request_types(syncable::ModelTypeSet value) {
+ void set_updates_request_types(syncer::ModelTypeSet value) {
model_neutral_.updates_request_types = value;
}
const ClientToServerResponse& updates_response() const {
@@ -143,7 +143,7 @@ class StatusController {
}
bool HasBookmarkCommitActivity() const {
- return ActiveGroupRestrictionIncludesModel(syncable::BOOKMARKS);
+ return ActiveGroupRestrictionIncludesModel(syncer::BOOKMARKS);
}
const ModelNeutralState& model_neutral_state() const {
@@ -158,7 +158,7 @@ class StatusController {
void increment_num_updates_downloaded_by(int value);
void increment_num_tombstone_updates_downloaded_by(int value);
void increment_num_reflected_updates_downloaded_by(int value);
- void set_types_needing_local_migration(syncable::ModelTypeSet types);
+ void set_types_needing_local_migration(syncer::ModelTypeSet types);
void increment_num_local_overwrites();
void increment_num_server_overwrites();
void set_sync_protocol_error(const SyncProtocolError& error);
@@ -179,7 +179,7 @@ class StatusController {
// Check whether a particular model is included by the active group
// restriction.
- bool ActiveGroupRestrictionIncludesModel(syncable::ModelType model) const {
+ bool ActiveGroupRestrictionIncludesModel(syncer::ModelType model) const {
if (!group_restriction_in_effect_)
return true;
ModelSafeRoutingInfo::const_iterator it = routing_info_.find(model);
« no previous file with comments | « sync/sessions/session_state_unittest.cc ('k') | sync/sessions/status_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698