| Index: chrome/browser/ui/webui/sync_setup_handler.cc
|
| diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| index d3e6f69219a97d1fad116575ae718db47d342399..324fdc826e2d9e98a871fcac22b9b6edeb455fc8 100644
|
| --- a/chrome/browser/ui/webui/sync_setup_handler.cc
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| @@ -729,8 +729,11 @@ void SyncSetupHandler::HandleConfigure(const base::ListValue* args) {
|
| }
|
|
|
| void SyncSetupHandler::HandleShowSetupUI(const base::ListValue* args) {
|
| - ProfileSyncService* service = GetSyncService();
|
| - DCHECK(service);
|
| + if (!GetSyncService()) {
|
| + DLOG(WARNING) << "Cannot display sync UI when sync is disabled";
|
| + CloseUI();
|
| + return;
|
| + }
|
|
|
| SigninManagerBase* signin =
|
| SigninManagerFactory::GetForProfile(GetProfile());
|
|
|