summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/auth_watcher.cc
diff options
context:
space:
mode:
authormunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 19:40:59 +0000
committermunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 19:40:59 +0000
commit6d201be0c55eccdc015124e221d2559a6da7fef0 (patch)
tree121e988c25e62017a08bcbe908a4e6a5f78d34f8 /chrome/browser/sync/engine/auth_watcher.cc
parentdc9711fe5e00639471fd0edf195a4ada4f7d994d (diff)
downloadchromium_src-6d201be0c55eccdc015124e221d2559a6da7fef0.zip
chromium_src-6d201be0c55eccdc015124e221d2559a6da7fef0.tar.gz
chromium_src-6d201be0c55eccdc015124e221d2559a6da7fef0.tar.bz2
Part 1 of removing PathSTring. I scrubbed files that are not
in chron's CL to avoid merge. Review URL: http://codereview.chromium.org/393011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31930 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/auth_watcher.cc')
-rw-r--r--chrome/browser/sync/engine/auth_watcher.cc6
1 files changed, 3 insertions, 3 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;