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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/glue/extension_model_associator.h

Issue 7497014: Revert 94128 - [Sync] Refactor sync datatype error handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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/sync/glue/extension_data_type_controller_unittest.cc ('k') | chrome/browser/sync/glue/extension_model_associator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/extension_model_associator.h
===================================================================
--- chrome/browser/sync/glue/extension_model_associator.h (revision 94142)
+++ chrome/browser/sync/glue/extension_model_associator.h (working copy)
@@ -7,7 +7,6 @@
#pragma once
#include "base/basictypes.h"
-#include "chrome/browser/sync/api/sync_error.h"
#include "chrome/browser/sync/glue/extension_sync_traits.h"
#include "chrome/browser/sync/glue/model_associator.h"
#include "chrome/browser/sync/syncable/model_type.h"
@@ -33,8 +32,8 @@
static syncable::ModelType model_type() { return syncable::EXTENSIONS; }
// AssociatorInterface implementation.
- virtual bool AssociateModels(SyncError* error);
- virtual bool DisassociateModels(SyncError* error);
+ virtual bool AssociateModels();
+ virtual bool DisassociateModels();
virtual bool SyncModelHasUserCreatedNodes(bool* has_nodes);
virtual void AbortAssociation();
virtual bool CryptoReadyIfNecessary();
« no previous file with comments | « chrome/browser/sync/glue/extension_data_type_controller_unittest.cc ('k') | chrome/browser/sync/glue/extension_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698