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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2044303004: Sync: Support multiple setup UIs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android Created 4 years, 6 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/profile_sync_service_android.h ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.h » ('j') | chrome/browser/sync/test/integration/profile_sync_service_harness.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/profile_sync_service_android.cc
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 81d83b85dd04e9ef2d31a016686756ba7a13bb5d..703ef0b70cba6c3fa467cd5a1c86c9d419a12181 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -186,7 +186,10 @@ void ProfileSyncServiceAndroid::SetSetupInProgress(
const JavaParamRef<jobject>& obj,
jboolean in_progress) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- sync_service_->SetSetupInProgress(in_progress);
+ if (in_progress)
maxbogue 2016/06/09 20:04:11 Curly braces please
tommycli 2016/06/10 00:04:15 Done.
+ setup_handle_ = sync_service_->GetSetupInProgressHandle();
+ else
+ setup_handle_.reset();
}
jboolean ProfileSyncServiceAndroid::IsFirstSetupComplete(
« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.h ('k') | chrome/browser/sync/test/integration/profile_sync_service_harness.h » ('j') | chrome/browser/sync/test/integration/profile_sync_service_harness.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698