| Index: chrome/browser/prefs/browser_prefs.cc
|
| diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
|
| index f954807629df35883c88fcefd550948e42e9bc13..c3c90fca324033dd1b2bde0bc748e29a1c4c10a9 100644
|
| --- a/chrome/browser/prefs/browser_prefs.cc
|
| +++ b/chrome/browser/prefs/browser_prefs.cc
|
| @@ -72,7 +72,6 @@
|
| #include "chrome/browser/ui/alternate_error_tab_observer.h"
|
| #include "chrome/browser/ui/app_list/app_list_service.h"
|
| #include "chrome/browser/ui/autofill/autofill_credit_card_bubble_controller.h"
|
| -#include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
|
| #include "chrome/browser/ui/browser_ui_prefs.h"
|
| #include "chrome/browser/ui/network_profile_bubble.h"
|
| #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
|
| @@ -95,6 +94,10 @@
|
| #include "components/user_prefs/pref_registry_syncable.h"
|
| #include "content/public/browser/render_process_host.h"
|
|
|
| +#if defined(ENABLE_AUTOFILL_DIALOG)
|
| +#include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
|
| +#endif
|
| +
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| #include "chrome/browser/policy/browser_policy_connector.h"
|
| #include "chrome/browser/policy/policy_statistics_collector.h"
|
| @@ -288,7 +291,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| AlternateErrorPageTabObserver::RegisterProfilePrefs(registry);
|
| apps::RegisterProfilePrefs(registry);
|
| autofill::AutofillCreditCardBubbleController::RegisterUserPrefs(registry);
|
| - autofill::AutofillDialogControllerImpl::RegisterProfilePrefs(registry);
|
| autofill::AutofillManager::RegisterProfilePrefs(registry);
|
| BookmarkPromptPrefs::RegisterProfilePrefs(registry);
|
| bookmark_utils::RegisterProfilePrefs(registry);
|
| @@ -321,6 +323,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| TemplateURLPrepopulateData::RegisterProfilePrefs(registry);
|
| TranslatePrefs::RegisterProfilePrefs(registry);
|
|
|
| +#if defined(ENABLE_AUTOFILL_DIALOG)
|
| + autofill::AutofillDialogController::RegisterProfilePrefs(registry);
|
| +#endif
|
| +
|
| #if defined(ENABLE_CONFIGURATION_POLICY)
|
| policy::URLBlacklistManager::RegisterProfilePrefs(registry);
|
| #endif
|
|
|