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

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

Issue 2395533003: [Sync] Move some things from driver to base. (Closed)
Patch Set: Rebase. Created 4 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
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/sync/profile_sync_service_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/chrome_sync_client.cc
diff --git a/chrome/browser/sync/chrome_sync_client.cc b/chrome/browser/sync/chrome_sync_client.cc
index 776691271149c15de62a4d53551763667057f069..a549fbb4c3484a63e1a4731418289a2a7dfc8ea4 100644
--- a/chrome/browser/sync/chrome_sync_client.cc
+++ b/chrome/browser/sync/chrome_sync_client.cc
@@ -54,8 +54,8 @@
#include "components/password_manager/sync/browser/password_model_worker.h"
#include "components/search_engines/search_engine_data_type_controller.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
+#include "components/sync/base/report_unrecoverable_error.h"
#include "components/sync/driver/glue/browser_thread_model_worker.h"
-#include "components/sync/driver/glue/chrome_report_unrecoverable_error.h"
#include "components/sync/driver/glue/ui_model_worker.h"
#include "components/sync/driver/sync_api_component_factory.h"
#include "components/sync/driver/sync_util.h"
@@ -513,7 +513,7 @@ void ChromeSyncClient::RegisterDesktopDataTypes(
syncer::ModelTypeSet disabled_types,
syncer::ModelTypeSet enabled_types) {
base::Closure error_callback =
- base::Bind(&syncer::ChromeReportUnrecoverableError, chrome::GetChannel());
+ base::Bind(&syncer::ReportUnrecoverableError, chrome::GetChannel());
#if defined(ENABLE_EXTENSIONS)
// App sync is enabled by default. Register unless explicitly
@@ -622,7 +622,7 @@ void ChromeSyncClient::RegisterAndroidDataTypes(
syncer::ModelTypeSet disabled_types,
syncer::ModelTypeSet enabled_types) {
base::Closure error_callback =
- base::Bind(&syncer::ChromeReportUnrecoverableError, chrome::GetChannel());
+ base::Bind(&syncer::ReportUnrecoverableError, chrome::GetChannel());
#if defined(ENABLE_SUPERVISED_USERS)
sync_service->RegisterDataTypeController(
base::MakeUnique<SupervisedUserSyncDataTypeController>(
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/sync/profile_sync_service_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698