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

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

Issue 8585037: Revert the revert. This change was not the cause of the failures, so relanding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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/all_status.h ('k') | chrome/browser/sync/internal_api/sync_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/engine/all_status.cc
===================================================================
--- chrome/browser/sync/engine/all_status.cc (revision 110530)
+++ chrome/browser/sync/engine/all_status.cc (working copy)
@@ -188,6 +188,11 @@
status_.crypto_has_pending_keys = has_pending_keys;
}
+void AllStatus::SetUniqueId(const std::string& guid) {
+ ScopedStatusLock lock(this);
+ status_.unique_id = guid;
+}
+
ScopedStatusLock::ScopedStatusLock(AllStatus* allstatus)
: allstatus_(allstatus) {
allstatus->mutex_.Acquire();
« no previous file with comments | « chrome/browser/sync/engine/all_status.h ('k') | chrome/browser/sync/internal_api/sync_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698