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

Unified Diff: chrome/browser/sync/glue/extension_backed_data_type_controller.cc

Issue 436733002: [Sync] Use OnSingleDataTypeUnrecoverableError for all errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 4 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/glue/extension_backed_data_type_controller.cc
diff --git a/chrome/browser/sync/glue/extension_backed_data_type_controller.cc b/chrome/browser/sync/glue/extension_backed_data_type_controller.cc
index b06f6df0fa36724df0e7089f561fb5b02939e4b7..7de4d7e732c1de49a12507d536253c1249c14164 100644
--- a/chrome/browser/sync/glue/extension_backed_data_type_controller.cc
+++ b/chrome/browser/sync/glue/extension_backed_data_type_controller.cc
@@ -30,7 +30,6 @@ std::string IdToHash(const std::string extension_id) {
} // namespace
ExtensionBackedDataTypeController::ExtensionBackedDataTypeController(
- const DisableTypeCallback& disable_callback,
syncer::ModelType type,
const std::string& extension_hash,
sync_driver::SyncApiComponentFactory* sync_factory,
@@ -38,7 +37,6 @@ ExtensionBackedDataTypeController::ExtensionBackedDataTypeController(
: UIDataTypeController(
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
base::Bind(&ChromeReportUnrecoverableError),
- disable_callback,
type,
sync_factory),
extension_hash_(extension_hash),
@@ -75,20 +73,16 @@ void ExtensionBackedDataTypeController::OnExtensionUnloaded(
const extensions::Extension* extension,
extensions::UnloadedExtensionInfo::Reason reason) {
if (DoesExtensionMatch(*extension)) {
- ProfileSyncService* sync_service =
- ProfileSyncServiceFactory::GetForProfile(profile_);
-
// This will trigger purging the datatype from the sync directory. This
// may not always be the right choice, especially in the face of transient
// unloads (e.g. for permission changes). If that becomes a large enough
// issue, we should consider using the extension unload reason to just
// trigger a reconfiguration without disabling (type will be unready).
- syncer::SyncError error(
- FROM_HERE,
- syncer::SyncError::DATATYPE_ERROR,
- "Extension unloaded",
- type());
- sync_service->DisableDatatype(error);
+ syncer::SyncError error(FROM_HERE,
+ syncer::SyncError::DATATYPE_POLICY_ERROR,
+ "Extension unloaded",
+ type());
+ OnSingleDataTypeUnrecoverableError(error);
}
}

Powered by Google App Engine
This is Rietveld 408576698