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

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

Issue 1967883002: Settings People Revamp: Fix some small bugs in the handler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix the failing test Created 4 years, 7 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
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 1ca63972498cc54f934d8d97b8c4eb7f09a89cf7..2a0cbfbda139c156506421a6add09d117ab31ad2 100644
--- a/chrome/browser/ui/webui/settings/people_handler.h
+++ b/chrome/browser/ui/webui/settings/people_handler.h
@@ -65,6 +65,9 @@ class PeopleHandler : public SettingsPageUIHandler,
friend class PeopleHandlerTest;
FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest,
DisplayConfigureWithBackendDisabledAndCancel);
+ FRIEND_TEST_ALL_PREFIXES(
+ PeopleHandlerTest,
+ DisplayConfigureWithBackendDisabledAndSyncStartupCompleted);
FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, HandleSetupUIWhenSyncDisabled);
FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, SelectCustomEncryption);
FRIEND_TEST_ALL_PREFIXES(PeopleHandlerTest, ShowSyncSetupWhenNotSignedIn);
@@ -112,11 +115,6 @@ class PeopleHandler : public SettingsPageUIHandler,
// sync_driver::SyncServiceObserver implementation.
void OnStateChanged() override;
- // Shows advanced configuration dialog without going through sign in dialog.
- // Kicks the sync backend if necessary with showing spinner dialog until it
- // gets ready.
- void OpenConfigureSync();
-
// Returns a newly created dictionary with a number of properties that
// correspond to the status of sync.
std::unique_ptr<base::DictionaryValue> GetSyncStatusDictionary();
@@ -200,7 +198,8 @@ class PeopleHandler : public SettingsPageUIHandler,
// Used to listen for pref changes to allow or disallow signin.
PrefChangeRegistrar profile_pref_registrar_;
- // Manages observer lifetime.
+ // Manages observer lifetimes.
+ ScopedObserver<SigninManagerBase, PeopleHandler> signin_observer_;
ScopedObserver<ProfileSyncService, PeopleHandler> sync_service_observer_;
DISALLOW_COPY_AND_ASSIGN(PeopleHandler);

Powered by Google App Engine
This is Rietveld 408576698