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

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

Issue 7918001: [Sync] Move ChangeRecord into its own file (change_record.{h,cc}) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 9 years, 3 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_change_processor.cc
diff --git a/chrome/browser/sync/glue/theme_change_processor.cc b/chrome/browser/sync/glue/theme_change_processor.cc
index 6876731bccb794ee09519cc7d8bc4699d7d4cd22..586a412380cca04f8d372c6e5b2a2436bcb38b84 100644
--- a/chrome/browser/sync/glue/theme_change_processor.cc
+++ b/chrome/browser/sync/glue/theme_change_processor.cc
@@ -8,8 +8,8 @@
#include "base/tracked.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/glue/theme_util.h"
+#include "chrome/browser/sync/internal_api/change_record.h"
#include "chrome/browser/sync/internal_api/read_node.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
#include "chrome/browser/sync/internal_api/write_node.h"
#include "chrome/browser/sync/internal_api/write_transaction.h"
#include "chrome/browser/sync/protocol/theme_specifics.pb.h"
@@ -64,8 +64,7 @@ void ThemeChangeProcessor::Observe(int type,
void ThemeChangeProcessor::ApplyChangesFromSyncModel(
const sync_api::BaseTransaction* trans,
- const sync_api::SyncManager::ChangeRecord* changes,
- int change_count) {
+ const sync_api::ImmutableChangeRecordList& changes) {
if (!running()) {
return;
}
@@ -74,20 +73,20 @@ void ThemeChangeProcessor::ApplyChangesFromSyncModel(
// generates multiple changes. When we fix syncapi to not do that,
// we can remove the extra logic below. See:
// http://code.google.com/p/chromium/issues/detail?id=41696 .
- if (change_count < 1) {
- std::string err("Unexpected change_count: ");
- err += change_count;
- error_handler()->OnUnrecoverableError(FROM_HERE, err);
+ if (changes.Get().empty()) {
+ error_handler()->OnUnrecoverableError(FROM_HERE,
+ "Change list unexpectedly empty");
return;
}
- if (change_count > 1) {
+ const size_t change_count = changes.Get().size();
+ if (change_count > 1u) {
LOG(WARNING) << change_count << " theme changes detected; "
<< "only applying the last one";
}
- const sync_api::SyncManager::ChangeRecord& change =
- changes[change_count - 1];
- if (change.action != sync_api::SyncManager::ChangeRecord::ACTION_UPDATE &&
- change.action != sync_api::SyncManager::ChangeRecord::ACTION_DELETE) {
+ const sync_api::ChangeRecord& change =
+ changes.Get()[change_count - 1];
+ if (change.action != sync_api::ChangeRecord::ACTION_UPDATE &&
+ change.action != sync_api::ChangeRecord::ACTION_DELETE) {
std::string err = "strange theme change.action " + change.action;
error_handler()->OnUnrecoverableError(FROM_HERE, err);
return;
@@ -95,7 +94,7 @@ void ThemeChangeProcessor::ApplyChangesFromSyncModel(
sync_pb::ThemeSpecifics theme_specifics;
// If the action is a delete, simply use the default values for
// ThemeSpecifics, which would cause the default theme to be set.
- if (change.action != sync_api::SyncManager::ChangeRecord::ACTION_DELETE) {
+ if (change.action != sync_api::ChangeRecord::ACTION_DELETE) {
sync_api::ReadNode node(trans);
if (!node.InitByIdLookup(change.id)) {
error_handler()->OnUnrecoverableError(FROM_HERE,
« no previous file with comments | « chrome/browser/sync/glue/theme_change_processor.h ('k') | chrome/browser/sync/glue/typed_url_change_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698