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

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

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
Index: chrome/browser/sync/glue/theme_model_associator.cc
===================================================================
--- chrome/browser/sync/glue/theme_model_associator.cc (revision 94142)
+++ chrome/browser/sync/glue/theme_model_associator.cc (working copy)
@@ -8,7 +8,6 @@
#include "base/logging.h"
#include "base/tracked.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/sync/api/sync_error.h"
#include "chrome/browser/sync/engine/syncapi.h"
#include "chrome/browser/sync/glue/sync_backend_host.h"
#include "chrome/browser/sync/glue/theme_util.h"
@@ -36,11 +35,11 @@
ThemeModelAssociator::~ThemeModelAssociator() {}
-bool ThemeModelAssociator::AssociateModels(SyncError* error) {
+bool ThemeModelAssociator::AssociateModels() {
sync_api::WriteTransaction trans(FROM_HERE, sync_service_->GetUserShare());
sync_api::ReadNode root(&trans);
if (!root.InitByTagLookup(kThemesTag)) {
- error->Reset(FROM_HERE, kNoThemesFolderError, model_type());
+ LOG(ERROR) << kNoThemesFolderError;
return false;
}
@@ -63,9 +62,7 @@
sync_api::WriteNode node(&trans);
if (!node.InitUniqueByCreation(syncable::THEMES, root,
kCurrentThemeClientTag)) {
- error->Reset(FROM_HERE,
- "Could not create current theme node.",
- model_type());
+ LOG(ERROR) << "Could not create current theme node.";
return false;
}
node.SetIsFolder(false);
@@ -77,7 +74,7 @@
return true;
}
-bool ThemeModelAssociator::DisassociateModels(SyncError* error) {
+bool ThemeModelAssociator::DisassociateModels() {
// We don't maintain any association state, so nothing to do.
return true;
}
« no previous file with comments | « chrome/browser/sync/glue/theme_model_associator.h ('k') | chrome/browser/sync/glue/typed_url_model_associator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698