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

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

Issue 7926001: [Sync] Move change-related methods out of SyncManager::Observer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bug in async encryption, sync to head 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/syncable/syncable.cc
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index 700ff57dfbe80ef7e91b733945a39784e0c1060d..fd030b1360889224bde1254f08231e0235a42ffb 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -90,8 +90,6 @@ std::string WriterTagToString(WriterTag writer_tag) {
#undef ENUM_CASE
-namespace {
-
DictionaryValue* EntryKernelMutationToValue(
const EntryKernelMutation& mutation) {
DictionaryValue* dict = new DictionaryValue();
@@ -100,8 +98,6 @@ DictionaryValue* EntryKernelMutationToValue(
return dict;
}
-} // namespace
-
ListValue* EntryKernelMutationMapToValue(
const EntryKernelMutationMap& mutations) {
ListValue* list = new ListValue();
@@ -1248,14 +1244,14 @@ ModelTypeBitSet WriteTransaction::NotifyTransactionChangingAndEnding(
DirectoryChangeDelegate* const delegate = dirkernel_->delegate;
if (writer_ == syncable::SYNCAPI) {
delegate->HandleCalculateChangesChangeEventFromSyncApi(
- mutations.Get(), this);
+ mutations, this);
} else {
delegate->HandleCalculateChangesChangeEventFromSyncer(
- mutations.Get(), this);
+ mutations, this);
}
ModelTypeBitSet models_with_changes =
- delegate->HandleTransactionEndingChangeEvent(this);
+ delegate->HandleTransactionEndingChangeEvent(mutations, this);
dirkernel_->observers->Notify(
&TransactionObserver::OnTransactionMutate,

Powered by Google App Engine
This is Rietveld 408576698