| Index: sync/sessions/status_controller.h
|
| diff --git a/sync/sessions/status_controller.h b/sync/sessions/status_controller.h
|
| index 9ffc93f585baaac4b0f0faf84654f523cb209b40..8542b48ecb2b401f97187eaae30e0306df86538b 100644
|
| --- a/sync/sessions/status_controller.h
|
| +++ b/sync/sessions/status_controller.h
|
| @@ -67,10 +67,10 @@ class StatusController {
|
| ModelSafeGroup group);
|
|
|
| // ClientToServer messages.
|
| - const syncer::ModelTypeSet updates_request_types() const {
|
| + const ModelTypeSet updates_request_types() const {
|
| return model_neutral_.updates_request_types;
|
| }
|
| - void set_updates_request_types(syncer::ModelTypeSet value) {
|
| + void set_updates_request_types(ModelTypeSet value) {
|
| model_neutral_.updates_request_types = value;
|
| }
|
| const sync_pb::ClientToServerResponse& updates_response() const {
|
| @@ -142,7 +142,7 @@ class StatusController {
|
| }
|
|
|
| bool HasBookmarkCommitActivity() const {
|
| - return ActiveGroupRestrictionIncludesModel(syncer::BOOKMARKS);
|
| + return ActiveGroupRestrictionIncludesModel(BOOKMARKS);
|
| }
|
|
|
| const ModelNeutralState& model_neutral_state() const {
|
| @@ -157,7 +157,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(syncer::ModelTypeSet types);
|
| + void set_types_needing_local_migration(ModelTypeSet types);
|
| void increment_num_local_overwrites();
|
| void increment_num_server_overwrites();
|
| void set_sync_protocol_error(const SyncProtocolError& error);
|
| @@ -178,7 +178,7 @@ class StatusController {
|
|
|
| // Check whether a particular model is included by the active group
|
| // restriction.
|
| - bool ActiveGroupRestrictionIncludesModel(syncer::ModelType model) const {
|
| + bool ActiveGroupRestrictionIncludesModel(ModelType model) const {
|
| if (!group_restriction_in_effect_)
|
| return true;
|
| ModelSafeRoutingInfo::const_iterator it = routing_info_.find(model);
|
|
|