chrome/browser/sync/profile_sync_components_factory_impl.cc - Issue 1373573003: [Sync] Componentize AutofillWalletDataTypeController.

Unified Diff: chrome/browser/sync/profile_sync_components_factory_impl.cc

Issue 1373573003: [Sync] Componentize AutofillWalletDataTypeController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Missing gyp dep. Created 5 years, 2 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: chrome/browser/sync/profile_sync_components_factory_impl.cc

diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc

index 442197e9a2930e15115102be4e9cb5b146dc85c8..207a0a74186ae326ce1ec8c20d42da436a8a0c62 100644

--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc

+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc

@@ -11,7 +11,6 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/sync/glue/autofill_data_type_controller.h"

#include "chrome/browser/sync/glue/autofill_profile_data_type_controller.h"

-#include "chrome/browser/sync/glue/autofill_wallet_data_type_controller.h"

#include "chrome/browser/sync/glue/bookmark_change_processor.h"

#include "chrome/browser/sync/glue/bookmark_data_type_controller.h"

#include "chrome/browser/sync/glue/bookmark_model_associator.h"

@@ -29,6 +28,7 @@

#include "chrome/browser/sync/sessions/session_data_type_controller.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

+#include "components/autofill/core/browser/autofill_wallet_data_type_controller.h"

#include "components/autofill/core/common/autofill_pref_names.h"

#include "components/autofill/core/common/autofill_switches.h"

#include "components/dom_distiller/core/dom_distiller_features.h"

@@ -187,7 +187,10 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(

if (!wallet_disabled) {

sync_service->RegisterDataTypeController(

new browser_sync::AutofillWalletDataTypeController(

- sync_client, syncer::AUTOFILL_WALLET_DATA));

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),

+ base::Bind(&ChromeReportUnrecoverableError), sync_client,

+ syncer::AUTOFILL_WALLET_DATA));

}

// Wallet metadata sync depends on Wallet data sync and is disabled by

@@ -196,7 +199,10 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes(

if (!wallet_disabled && enabled_types.Has(syncer::AUTOFILL_WALLET_METADATA)) {

sync_service->RegisterDataTypeController(

new browser_sync::AutofillWalletDataTypeController(

- sync_client, syncer::AUTOFILL_WALLET_METADATA));

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),

+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),

+ base::Bind(&ChromeReportUnrecoverableError), sync_client,

+ syncer::AUTOFILL_WALLET_DATA));

please use gerrit instead 2015/10/07 20:17:52 Oops, this should really be syncer::AUTOFILL_WALLE

}

// Bookmark sync is enabled by default. Register unless explicitly

« no previous file with comments | « chrome/browser/sync/glue/autofill_wallet_data_type_controller.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »