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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2657673004: Add shutdown notification and service refs to SyncServiceObserver. (Closed)
Patch Set: Use parameter Created 3 years, 11 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/options/browser_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index 3490fe533c87e63d932622dfeca69f3d4ffcb867..aeb6a6c49de9c26c1dca4bfb04a89724462fb374 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -947,19 +947,19 @@ void BrowserOptionsHandler::Uninitialize() {
#endif
}
-void BrowserOptionsHandler::OnStateChanged() {
+void BrowserOptionsHandler::OnStateChanged(syncer::SyncService* sync) {
UpdateSyncState();
}
void BrowserOptionsHandler::GoogleSigninSucceeded(const std::string& account_id,
const std::string& username,
const std::string& password) {
- OnStateChanged();
+ UpdateSyncState();
}
void BrowserOptionsHandler::GoogleSignedOut(const std::string& account_id,
const std::string& username) {
- OnStateChanged();
+ UpdateSyncState();
}
void BrowserOptionsHandler::PageLoadStarted() {
@@ -1122,7 +1122,7 @@ void BrowserOptionsHandler::InitializePage() {
OnTemplateURLServiceChanged();
ObserveThemeChanged();
- OnStateChanged();
+ UpdateSyncState();
#if !defined(OS_CHROMEOS)
UpdateDefaultBrowserState();
#endif
@@ -1374,7 +1374,7 @@ void BrowserOptionsHandler::Observe(
break;
case chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED:
// Update our sync/signin status display.
- OnStateChanged();
+ UpdateSyncState();
break;
default:
NOTREACHED();

Powered by Google App Engine
This is Rietveld 408576698