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

Unified Diff: chrome/browser/sync/engine/process_commit_response_command.cc

Issue 7981006: [Sync] use base::Time in sync (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix linux compile errors 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
« no previous file with comments | « chrome/browser/sync/engine/build_commit_command.cc ('k') | chrome/browser/sync/engine/syncer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/process_commit_response_command.cc
diff --git a/chrome/browser/sync/engine/process_commit_response_command.cc b/chrome/browser/sync/engine/process_commit_response_command.cc
index 49f1fbf7da888982a5ea093799f54a54a2a2abbb..3dfe591b81de39fd4634fd07dd99ab05c5b285e6 100644
--- a/chrome/browser/sync/engine/process_commit_response_command.cc
+++ b/chrome/browser/sync/engine/process_commit_response_command.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/sync/sessions/sync_session.h"
#include "chrome/browser/sync/syncable/directory_manager.h"
#include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/util/time.h"
using syncable::ScopedDirLookup;
using syncable::WriteTransaction;
@@ -380,9 +381,9 @@ void ProcessCommitResponseCommand::UpdateServerFieldsAfterCommit(
local_entry->Put(syncable::SERVER_SPECIFICS,
committed_entry.specifics());
local_entry->Put(syncable::SERVER_MTIME,
- committed_entry.mtime());
+ ProtoTimeToTime(committed_entry.mtime()));
local_entry->Put(syncable::SERVER_CTIME,
- committed_entry.ctime());
+ ProtoTimeToTime(committed_entry.ctime()));
local_entry->Put(syncable::SERVER_POSITION_IN_PARENT,
entry_response.position_in_parent());
// TODO(nick): The server doesn't set entry_response.server_parent_id in
« no previous file with comments | « chrome/browser/sync/engine/build_commit_command.cc ('k') | chrome/browser/sync/engine/syncer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698