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

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

Issue 10829029: sync: don't display one-click if setup is in progress (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 8 years, 5 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 | « no previous file | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service.cc
diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc
index 7fa28b89d5b21eead6ff2fe2cc757b6a56e3e707..4b72b179f4fbdbcb740b5638255cb4fcb166b4d4 100644
--- a/chrome/browser/sync/profile_sync_service.cc
+++ b/chrome/browser/sync/profile_sync_service.cc
@@ -992,8 +992,9 @@ bool ProfileSyncService::FirstSetupInProgress() const {
}
void ProfileSyncService::SetSetupInProgress(bool setup_in_progress) {
+ bool was_in_progress = setup_in_progress_;
setup_in_progress_ = setup_in_progress;
- if (!setup_in_progress) {
+ if (!setup_in_progress && was_in_progress) {
if (sync_initialized()) {
ReconfigureDatatypeManager();
}
« no previous file with comments | « no previous file | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698