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

Unified Diff: chrome/browser/ui/webui/settings/people_handler.h

Issue 2971353002: [sync] Prevent flash of error icon while loading syncSetup page (Closed)
Patch Set: rename MaybeAcquireSyncBlocker Created 3 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/ui/webui/settings/people_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/people_handler.h
diff --git a/chrome/browser/ui/webui/settings/people_handler.h b/chrome/browser/ui/webui/settings/people_handler.h
index 7b587f71633eb0597223b66936e8f18f8f80e7ed..be8ab4ea3a4f0308844ef236ef330d75c6b621dc 100644
--- a/chrome/browser/ui/webui/settings/people_handler.h
+++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -98,6 +98,8 @@ class PeopleHandler : public SettingsPageUIHandler,
FRIEND_TEST_ALL_PREFIXES(PeopleHandlerNonCrosTest,
SubmitAuthWithInvalidUsername);
FRIEND_TEST_ALL_PREFIXES(PeopleHandlerFirstSigninTest, DisplayBasicLogin);
+ FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest,
+ AcquireSyncBlockerWhenLoadingSyncSettingsSubpage);
// SettingsPageUIHandler implementation.
void RegisterMessages() override;
@@ -174,6 +176,15 @@ class PeopleHandler : public SettingsPageUIHandler,
// Suppresses any further signin promos, since the user has signed in once.
void MarkFirstSetupComplete();
+ // If we're directly loading the sync setup page, we acquire a
+ // SetupInProgressHandle early in order to prevent a lapse in
+ // ProfileSyncService's "SetupInProgress" status. This lapse previously
+ // occured between when the sync confirmation dialog was closed and when the
+ // sync setup page hadn't yet fired the SyncSetupShowSetupUI event.
+ // InitializeSyncBlocker is responsible for checking if we're navigating to
+ // the setup page and acquiring the sync_blocker.
+ void InitializeSyncBlocker();
+
// Weak pointer.
Profile* profile_;
« no previous file with comments | « no previous file | chrome/browser/ui/webui/settings/people_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698