| Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| index 17aded5fccb7607641b984ece7a6ac816e5454cc..743b5ae0e936ddc75a0a93eeb7ed7e622645b7d1 100644
|
| --- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
|
| @@ -41,6 +41,8 @@
|
| #include "chrome/browser/search_engines/template_url_service.h"
|
| #include "chrome/browser/search_engines/template_url_service_factory.h"
|
| #include "chrome/browser/service/service_process_control.h"
|
| +#include "chrome/browser/signin/signin_manager.h"
|
| +#include "chrome/browser/signin/signin_manager_factory.h"
|
| #include "chrome/browser/sync/profile_sync_service.h"
|
| #include "chrome/browser/sync/profile_sync_service_factory.h"
|
| #include "chrome/browser/sync/sync_ui_util.h"
|
| @@ -1016,8 +1018,11 @@ DictionaryValue* BrowserOptionsHandler::GetSyncStateDictionary() {
|
|
|
| string16 status_label;
|
| string16 link_label;
|
| + SigninManager* signin = SigninManagerFactory::GetForProfile(
|
| + Profile::FromWebUI(web_ui()));
|
| +
|
| bool status_has_error = sync_ui_util::GetStatusLabels(
|
| - service, sync_ui_util::WITH_HTML, &status_label, &link_label) ==
|
| + service, *signin, sync_ui_util::WITH_HTML, &status_label, &link_label) ==
|
| sync_ui_util::SYNC_ERROR;
|
| sync_status->SetString("statusText", status_label);
|
| sync_status->SetString("actionLinkText", link_label);
|
|
|