components/autofill/core/browser/personal_data_manager.cc - Issue 329293002: Revert "Revert 3 mac autofill CLs."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 329293002: Revert "Revert 3 mac autofill CLs." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

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 1d4173e592564b7f0d24937d8cbc9d994ddbea25..5454b1cd58aebdf3e12ade1ab7d88347b1f02c6c 100644

--- a/components/autofill/core/browser/personal_data_manager.cc

+++ b/components/autofill/core/browser/personal_data_manager.cc

@@ -525,9 +525,13 @@ bool PersonalDataManager::IsDataLoaded() const {

}

const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles() const {

- if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled)) {

+#if defined(OS_MACOSX) && !defined(OS_IOS)

+ if (!pref_service_->GetBoolean(prefs::kAutofillUseMacAddressBook))

return web_profiles();

- }

+#else

+ if (!pref_service_->GetBoolean(prefs::kAutofillAuxiliaryProfilesEnabled))

+ return web_profiles();

+#endif // defined(OS_MACOSX) && !defined(OS_IOS)

profiles_.clear();