diff options
Diffstat (limited to 'chrome/browser/sync/engine')
7 files changed, 13 insertions, 11 deletions
diff --git a/chrome/browser/sync/engine/auth_watcher.cc b/chrome/browser/sync/engine/auth_watcher.cc index 1f78d15..b62c948 100644 --- a/chrome/browser/sync/engine/auth_watcher.cc +++ b/chrome/browser/sync/engine/auth_watcher.cc @@ -121,7 +121,7 @@ void AuthWatcher::DoAuthenticateWithToken(const std::string& gaia_email, case Authenticator::SUCCESS: { status_ = GAIA_AUTHENTICATED; - const PathString& share_name = email; + const std::string& share_name = email; user_settings_->SwitchUser(email); // Set the authentication token for notifications @@ -163,7 +163,7 @@ bool AuthWatcher::AuthenticateLocally(string email) { gaia_->SetUsername(email); status_ = LOCALLY_AUTHENTICATED; user_settings_->SwitchUser(email); - const PathString& share_name = email; + const std::string& share_name = email; LoadDirectoryListAndOpen(share_name); NotifyAuthSucceeded(email); return true; @@ -289,7 +289,7 @@ void AuthWatcher::DoHandleServerConnectionEvent( } } -bool AuthWatcher::LoadDirectoryListAndOpen(const PathString& login) { +bool AuthWatcher::LoadDirectoryListAndOpen(const std::string& login) { DCHECK_EQ(MessageLoop::current(), message_loop()); LOG(INFO) << "LoadDirectoryListAndOpen(" << login << ")"; bool initial_sync_ended = false; diff --git a/chrome/browser/sync/engine/auth_watcher.h b/chrome/browser/sync/engine/auth_watcher.h index 20760e4..e5422ad 100644 --- a/chrome/browser/sync/engine/auth_watcher.h +++ b/chrome/browser/sync/engine/auth_watcher.h @@ -96,7 +96,7 @@ class AuthWatcher : public base::RefCountedThreadSafe<AuthWatcher> { // Returns true if the open share has gotten zero updates from the sync // server (initial sync complete). - bool LoadDirectoryListAndOpen(const PathString& login); + bool LoadDirectoryListAndOpen(const std::string& login); typedef EventChannel<AuthWatcherEvent, Lock> Channel; diff --git a/chrome/browser/sync/engine/net/server_connection_manager.cc b/chrome/browser/sync/engine/net/server_connection_manager.cc index 38d140f..10c6aef 100644 --- a/chrome/browser/sync/engine/net/server_connection_manager.cc +++ b/chrome/browser/sync/engine/net/server_connection_manager.cc @@ -345,7 +345,7 @@ void ServerConnectionManager::GetServerParameters(string* server_url, bool FillMessageWithShareDetails(sync_pb::ClientToServerMessage* csm, syncable::DirectoryManager* manager, - const PathString &share) { + const std::string& share) { syncable::ScopedDirLookup dir(manager, share); if (!dir.good()) { LOG(INFO) << "Dir lookup failed"; diff --git a/chrome/browser/sync/engine/net/server_connection_manager.h b/chrome/browser/sync/engine/net/server_connection_manager.h index 5773a44..c34d4ae 100644 --- a/chrome/browser/sync/engine/net/server_connection_manager.h +++ b/chrome/browser/sync/engine/net/server_connection_manager.h @@ -344,7 +344,7 @@ class ServerConnectionManager { // settings. bool FillMessageWithShareDetails(sync_pb::ClientToServerMessage* csm, syncable::DirectoryManager* manager, - const PathString &share); + const std::string& share); } // namespace browser_sync diff --git a/chrome/browser/sync/engine/sync_process_state.cc b/chrome/browser/sync/engine/sync_process_state.cc index 7fe7415..b842f47 100644 --- a/chrome/browser/sync/engine/sync_process_state.cc +++ b/chrome/browser/sync/engine/sync_process_state.cc @@ -32,7 +32,7 @@ SyncProcessState::SyncProcessState(const SyncProcessState& counts) } SyncProcessState::SyncProcessState(syncable::DirectoryManager* dirman, - PathString account_name, + std::string account_name, ServerConnectionManager* connection_manager, ConflictResolver* const resolver, SyncerEventChannel* syncer_event_channel, diff --git a/chrome/browser/sync/engine/sync_process_state.h b/chrome/browser/sync/engine/sync_process_state.h index 4e63695..cefd22f 100644 --- a/chrome/browser/sync/engine/sync_process_state.h +++ b/chrome/browser/sync/engine/sync_process_state.h @@ -14,6 +14,7 @@ #include <map> #include <set> +#include <string> #include <utility> // for pair<> #include "base/atomicops.h" @@ -37,7 +38,7 @@ class SyncProcessState { ~SyncProcessState(); SyncProcessState( syncable::DirectoryManager* dirman, - PathString account_name, + std::string account_name, ServerConnectionManager* connection_manager, ConflictResolver* const resolver, SyncerEventChannel* syncer_event_channel, @@ -47,7 +48,7 @@ class SyncProcessState { SyncProcessState(const SyncProcessState& counts); SyncProcessState& operator=(const SyncProcessState& that); - PathString account_name() const { return account_name_; } + std::string account_name() const { return account_name_; } syncable::DirectoryManager* dirman() const { return dirman_; } @@ -251,7 +252,7 @@ class SyncProcessState { auth_failed_(false) {} ServerConnectionManager* connection_manager_; - const PathString account_name_; + const std::string account_name_; syncable::DirectoryManager* const dirman_; ConflictResolver* const resolver_; ModelSafeWorker* const model_safe_worker_; diff --git a/chrome/browser/sync/engine/syncer_session.h b/chrome/browser/sync/engine/syncer_session.h index d15f747..6b24098 100644 --- a/chrome/browser/sync/engine/syncer_session.h +++ b/chrome/browser/sync/engine/syncer_session.h @@ -11,6 +11,7 @@ #ifndef CHROME_BROWSER_SYNC_ENGINE_SYNCER_SESSION_H_ #define CHROME_BROWSER_SYNC_ENGINE_SYNCER_SESSION_H_ +#include <string> #include <utility> #include <vector> @@ -100,7 +101,7 @@ class SyncerSession { return sync_cycle_state_->HasAppliedUpdates(); } - PathString account_name() const { + std::string account_name() const { return sync_process_state_->account_name(); } |