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

Unified Diff: chrome/browser/sync/profile_sync_service.h

Issue 10698014: [Sync] Rename csync namespace to syncer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/sync/profile_sync_service.h
diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h
index f86ce30cc87998856df88f550b7398e22f8636f0..9f89ca217cf2033997ecd139bf03994a03c54ebb 100644
--- a/chrome/browser/sync/profile_sync_service.h
+++ b/chrome/browser/sync/profile_sync_service.h
@@ -53,7 +53,7 @@ class SessionModelAssociator;
namespace sessions { class SyncSessionSnapshot; }
}
-namespace csync {
+namespace syncer {
class BaseTransaction;
struct SyncCredentials;
struct UserShare;
@@ -147,7 +147,7 @@ class EncryptedData;
//
class ProfileSyncService : public browser_sync::SyncFrontend,
public browser_sync::SyncPrefObserver,
- public csync::UnrecoverableErrorHandler,
+ public syncer::UnrecoverableErrorHandler,
public content::NotificationObserver,
public ProfileKeyedService {
public:
@@ -254,15 +254,15 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// SyncFrontend implementation.
virtual void OnBackendInitialized(
- const csync::WeakHandle<csync::JsBackend>& js_backend,
+ const syncer::WeakHandle<syncer::JsBackend>& js_backend,
bool success) OVERRIDE;
virtual void OnSyncCycleCompleted() OVERRIDE;
virtual void OnSyncConfigureRetry() OVERRIDE;
virtual void OnConnectionStatusChange(
- csync::ConnectionStatus status) OVERRIDE;
+ syncer::ConnectionStatus status) OVERRIDE;
virtual void OnStopSyncingPermanently() OVERRIDE;
virtual void OnPassphraseRequired(
- csync::PassphraseRequiredReason reason,
+ syncer::PassphraseRequiredReason reason,
const sync_pb::EncryptedData& pending_keys) OVERRIDE;
virtual void OnPassphraseAccepted() OVERRIDE;
virtual void OnEncryptedTypesChanged(
@@ -272,9 +272,9 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
virtual void OnMigrationNeededForTypes(
syncable::ModelTypeSet types) OVERRIDE;
virtual void OnExperimentsChanged(
- const csync::Experiments& experiments) OVERRIDE;
+ const syncer::Experiments& experiments) OVERRIDE;
virtual void OnActionableError(
- const csync::SyncProtocolError& error) OVERRIDE;
+ const syncer::SyncProtocolError& error) OVERRIDE;
// Update the last auth error and notify observers of error state.
void UpdateAuthErrorState(const GoogleServiceAuthError& error);
@@ -333,7 +333,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// we have an encrypted data type enabled.
virtual bool IsPassphraseRequiredForDecryption() const;
- csync::PassphraseRequiredReason passphrase_required_reason() const {
+ syncer::PassphraseRequiredReason passphrase_required_reason() const {
return passphrase_required_reason_;
}
@@ -355,7 +355,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// Returns a weak pointer to the service's JsController.
// Overrideable for testing purposes.
- virtual base::WeakPtr<csync::JsController> GetJsController();
+ virtual base::WeakPtr<syncer::JsController> GetJsController();
// Record stats on various events.
static void SyncEvent(SyncEventCodes code);
@@ -369,7 +369,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// management. If so, the user is not allowed to configure sync.
bool IsManaged() const;
- // csync::UnrecoverableErrorHandler implementation.
+ // syncer::UnrecoverableErrorHandler implementation.
virtual void OnUnrecoverableError(
const tracked_objects::Location& from_here,
const std::string& message) OVERRIDE;
@@ -388,13 +388,13 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// tests. Figure out how to pass the handle to the ModelAssociators
// directly, figure out how to expose this to tests, and remove this
// function.
- virtual csync::UserShare* GetUserShare() const;
+ virtual syncer::UserShare* GetUserShare() const;
// TODO(akalin): These two functions are used only by
// ProfileSyncServiceHarness. Figure out a different way to expose
// this info to that class, and remove these functions.
- virtual csync::sessions::SyncSessionSnapshot
+ virtual syncer::sessions::SyncSessionSnapshot
GetLastSessionSnapshot() const;
// Returns whether or not the underlying sync engine has made any
@@ -414,12 +414,12 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// classes. Figure out a different way to expose this info and
// remove this function.
void GetModelSafeRoutingInfo(
- csync::ModelSafeRoutingInfo* out) const;
+ syncer::ModelSafeRoutingInfo* out) const;
// Overridden by tests.
// TODO(zea): Remove these and have the dtc's call directly into the SBH.
virtual void ActivateDataType(
- syncable::ModelType type, csync::ModelSafeGroup group,
+ syncable::ModelType type, syncer::ModelSafeGroup group,
browser_sync::ChangeProcessor* change_processor);
virtual void DeactivateDataType(syncable::ModelType type);
@@ -453,7 +453,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// for sensitive data types. Caller must be holding a
// syncapi::BaseTransaction to ensure thread safety.
virtual bool IsCryptographerReady(
- const csync::BaseTransaction* trans) const;
+ const syncer::BaseTransaction* trans) const;
// Returns true if a secondary passphrase is being used. It is not legal
// to call this method before the backend is initialized.
@@ -547,7 +547,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
void ShutdownImpl(bool sync_disabled);
// Return SyncCredentials from the TokenService.
- csync::SyncCredentials GetCredentials();
+ syncer::SyncCredentials GetCredentials();
// Test need to override this to create backends that allow setting up
// initial conditions, such as populating sync nodes.
@@ -584,7 +584,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// Was the last SYNC_PASSPHRASE_REQUIRED notification sent because it
// was required for encryption, decryption with a cached passphrase, or
// because a new passphrase is required?
- csync::PassphraseRequiredReason passphrase_required_reason_;
+ syncer::PassphraseRequiredReason passphrase_required_reason_;
private:
enum UnrecoverableErrorReason {
@@ -728,7 +728,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
ObserverList<Observer> observers_;
- csync::SyncJsController sync_js_controller_;
+ syncer::SyncJsController sync_js_controller_;
content::NotificationRegistrar registrar_;
@@ -746,7 +746,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
std::string cached_passphrase_;
// The current set of encrypted types. Always a superset of
- // csync::Cryptographer::SensitiveTypes().
+ // syncer::Cryptographer::SensitiveTypes().
syncable::ModelTypeSet encrypted_types_;
// Whether we want to encrypt everything.
@@ -767,7 +767,7 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
// This is the last |SyncProtocolError| we received from the server that had
// an action set on it.
- csync::SyncProtocolError last_actionable_error_;
+ syncer::SyncProtocolError last_actionable_error_;
// This is used to show sync errors in the wrench menu.
scoped_ptr<SyncGlobalError> sync_global_error_;
@@ -785,13 +785,13 @@ class ProfileSyncService : public browser_sync::SyncFrontend,
bool setup_in_progress_;
// The set of currently enabled sync experiments.
- csync::Experiments current_experiments;
+ syncer::Experiments current_experiments;
DISALLOW_COPY_AND_ASSIGN(ProfileSyncService);
};
bool ShouldShowActionOnUI(
- const csync::SyncProtocolError& error);
+ const syncer::SyncProtocolError& error);
#endif // CHROME_BROWSER_SYNC_PROFILE_SYNC_SERVICE_H_

Powered by Google App Engine
This is Rietveld 408576698