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

Unified Diff: components/autofill/core/browser/personal_data_manager.cc

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv
Patch Set: rebased Created 5 years, 8 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: components/autofill/core/browser/personal_data_manager.cc
diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
index b7a0a46e0cfea0ac59b7cce98dd670f788ead666..15edaac0f6e769794fcb7694a0aae3f0caf9889b 100644
--- a/components/autofill/core/browser/personal_data_manager.cc
+++ b/components/autofill/core/browser/personal_data_manager.cc
@@ -30,6 +30,7 @@
#include "components/autofill/core/browser/validation.h"
#include "components/autofill/core/common/autofill_pref_names.h"
#include "components/autofill/core/common/autofill_switches.h"
+#include "components/signin/core/browser/account_tracker_service.h"
#include "components/signin/core/common/signin_pref_names.h"
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h"
#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_formatter.h"
@@ -241,14 +242,17 @@ PersonalDataManager::PersonalDataManager(const std::string& app_locale)
pending_server_creditcards_query_(0),
app_locale_(app_locale),
pref_service_(NULL),
+ account_tracker_(NULL),
is_off_the_record_(false),
has_logged_profile_count_(false) {}
void PersonalDataManager::Init(scoped_refptr<AutofillWebDataService> database,
PrefService* pref_service,
+ AccountTrackerService* account_tracker,
bool is_off_the_record) {
database_ = database;
SetPrefService(pref_service);
+ account_tracker_ = account_tracker;
is_off_the_record_ = is_off_the_record;
if (!is_off_the_record_)
@@ -306,8 +310,11 @@ void PersonalDataManager::OnWebDataServiceRequestDone(
&server_profiles_);
if (!server_profiles_.empty()) {
- base::string16 email = base::UTF8ToUTF16(
- pref_service_->GetString(::prefs::kGoogleServicesUsername));
+ std::string account_id =
+ pref_service_->GetString(::prefs::kGoogleServicesAccountId);
+ base::string16 email =
+ base::UTF8ToUTF16(
+ account_tracker_->GetAccountInfo(account_id).email);
DCHECK(!email.empty());
for (AutofillProfile* profile : server_profiles_)
profile->SetRawInfo(EMAIL_ADDRESS, email);

Powered by Google App Engine
This is Rietveld 408576698