| OLD | NEW | 
|---|
| 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "chrome/browser/sync/engine/syncapi.h" | 5 #include "chrome/browser/sync/engine/syncapi.h" | 
| 6 | 6 | 
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" | 
| 8 | 8 | 
| 9 #include <iomanip> | 9 #include <iomanip> | 
| 10 #include <list> | 10 #include <list> | 
| (...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1326   if (allstatus()->status().authenticated) | 1326   if (allstatus()->status().authenticated) | 
| 1327     return; | 1327     return; | 
| 1328   if (password.empty()) { | 1328   if (password.empty()) { | 
| 1329     // TODO(timsteele): Seems like this shouldn't be needed, but auth_watcher | 1329     // TODO(timsteele): Seems like this shouldn't be needed, but auth_watcher | 
| 1330     // currently drops blank password attempts on the floor and doesn't update | 1330     // currently drops blank password attempts on the floor and doesn't update | 
| 1331     // state; it only LOGs an error in this case. We want to make sure we set | 1331     // state; it only LOGs an error in this case. We want to make sure we set | 
| 1332     // our GoogleServiceAuthError state to denote an error. | 1332     // our GoogleServiceAuthError state to denote an error. | 
| 1333     RaiseAuthNeededEvent(); | 1333     RaiseAuthNeededEvent(); | 
| 1334   } | 1334   } | 
| 1335   auth_watcher()->Authenticate(username, password, std::string(), | 1335   auth_watcher()->Authenticate(username, password, std::string(), | 
| 1336                                captcha, true); | 1336                                captcha); | 
| 1337 } | 1337 } | 
| 1338 | 1338 | 
| 1339 void SyncManager::SyncInternal::AuthenticateWithLsid(const string& lsid) { | 1339 void SyncManager::SyncInternal::AuthenticateWithLsid(const string& lsid) { | 
| 1340   DCHECK(!lsid.empty()); | 1340   DCHECK(!lsid.empty()); | 
| 1341   auth_watcher()->AuthenticateWithLsid(lsid); | 1341   auth_watcher()->AuthenticateWithLsid(lsid); | 
| 1342 } | 1342 } | 
| 1343 | 1343 | 
| 1344 bool SyncManager::SyncInternal::AuthenticateForUser( | 1344 bool SyncManager::SyncInternal::AuthenticateForUser( | 
| 1345     const std::string& username, const std::string& auth_token) { | 1345     const std::string& username, const std::string& auth_token) { | 
| 1346   share_.authenticated_name = username; | 1346   share_.authenticated_name = username; | 
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1837 UserShare* SyncManager::GetUserShare() const { | 1837 UserShare* SyncManager::GetUserShare() const { | 
| 1838   DCHECK(data_->initialized()) << "GetUserShare requires initialization!"; | 1838   DCHECK(data_->initialized()) << "GetUserShare requires initialization!"; | 
| 1839   return data_->GetUserShare(); | 1839   return data_->GetUserShare(); | 
| 1840 } | 1840 } | 
| 1841 | 1841 | 
| 1842 SyncManager::ExtraAutofillChangeRecordData::~ExtraAutofillChangeRecordData() { | 1842 SyncManager::ExtraAutofillChangeRecordData::~ExtraAutofillChangeRecordData() { | 
| 1843   delete pre_deletion_data; | 1843   delete pre_deletion_data; | 
| 1844 } | 1844 } | 
| 1845 | 1845 | 
| 1846 }  // namespace sync_api | 1846 }  // namespace sync_api | 
| OLD | NEW | 
|---|