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

Unified Diff: chrome/browser/sync/js/js_sync_manager_observer.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/js/js_sync_manager_observer.cc
diff --git a/chrome/browser/sync/js/js_sync_manager_observer.cc b/chrome/browser/sync/js/js_sync_manager_observer.cc
index cc1005ce4152e13e63c45774d90ba414d6cb9b2a..71fc1fbb79ff480055a850481369ede9a77bc8fc 100644
--- a/chrome/browser/sync/js/js_sync_manager_observer.cc
+++ b/chrome/browser/sync/js/js_sync_manager_observer.cc
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/tracked.h"
#include "base/values.h"
+#include "chrome/browser/sync/internal_api/change_record.h"
#include "chrome/browser/sync/js/js_arg_list.h"
#include "chrome/browser/sync/js/js_event_details.h"
#include "chrome/browser/sync/js/js_event_handler.h"
@@ -31,8 +32,7 @@ void JsSyncManagerObserver::SetJsEventHandler(
void JsSyncManagerObserver::OnChangesApplied(
syncable::ModelType model_type,
const sync_api::BaseTransaction* trans,
- const sync_api::SyncManager::ChangeRecord* changes,
- int change_count) {
+ const sync_api::ImmutableChangeRecordList& changes) {
if (!event_handler_.IsInitialized()) {
return;
}
@@ -40,8 +40,9 @@ void JsSyncManagerObserver::OnChangesApplied(
details.SetString("modelType", syncable::ModelTypeToString(model_type));
ListValue* change_values = new ListValue();
details.Set("changes", change_values);
- for (int i = 0; i < change_count; ++i) {
- change_values->Append(changes[i].ToValue(trans));
+ for (sync_api::ChangeRecordList::const_iterator it =
+ changes.Get().begin(); it != changes.Get().end(); ++it) {
+ change_values->Append(it->ToValue(trans));
}
HandleJsEvent(FROM_HERE, "onChangesApplied", JsEventDetails(&details));
}
@@ -117,17 +118,6 @@ void JsSyncManagerObserver::OnEncryptionComplete(
HandleJsEvent(FROM_HERE, "onEncryptionComplete", JsEventDetails(&details));
}
-void JsSyncManagerObserver::OnMigrationNeededForTypes(
- const syncable::ModelTypeSet& types) {
- if (!event_handler_.IsInitialized()) {
- return;
- }
- DictionaryValue details;
- details.Set("types", syncable::ModelTypeSetToValue(types));
- HandleJsEvent(FROM_HERE, "onMigrationNeededForTypes",
- JsEventDetails(&details));
-}
-
void JsSyncManagerObserver::OnActionableError(
const SyncProtocolError& sync_error) {
if (!event_handler_.IsInitialized()) {
« no previous file with comments | « chrome/browser/sync/js/js_sync_manager_observer.h ('k') | chrome/browser/sync/js/js_sync_manager_observer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698