components/autofill/core/browser/personal_data_manager.cc - Issue 301343002: mac: Clean up autofill integration with Address Book.

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 301343002: mac: Clean up autofill integration with Address Book. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@autofill_cleanup2_base

Patch Set: Fix a cross-platform problem. Created 6 years, 7 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

« components/autofill/core/browser/autofill_test_utils.cc ('K') | « components/autofill/core/browser/autofill_test_utils.cc ('k') | components/autofill/core/browser/personal_data_manager_mac.mm » ('j') | components/autofill/core/common/autofill_pref_names.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..33efeb751334682cd4047524d28525f9646c83fc 100644

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

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

@@ -525,9 +525,14 @@ 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

Ilya Sherman 2014/06/03 23:48:59 nit: Should this be only on Android?

erikchen 2014/06/04 01:51:26 After the revert of the rename of the preference,

+ if (!pref_service_->GetBoolean(

+ prefs::kAutofillAndroidAuxiliaryProfilesEnabled))

+ return web_profiles();

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

profiles_.clear();