| Index: chrome/browser/dom_ui/options/personal_options_handler.cc
|
| diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc
|
| index 19420d2812912ec719994c126a425ae239e5e8ad..d8e5067fd76ed622bd0199d4ffc5f7594473ab26 100644
|
| --- a/chrome/browser/dom_ui/options/personal_options_handler.cc
|
| +++ b/chrome/browser/dom_ui/options/personal_options_handler.cc
|
| @@ -202,7 +202,7 @@ void PersonalOptionsHandler::OnStateChanged() {
|
| is_start_stop_button_visible = false;
|
| #else
|
| is_start_stop_button_visible = true;
|
| -#endif
|
| +#endif // defined(OS_CHROMEOS)
|
| is_start_stop_button_enabled = !managed;
|
| } else if (service->SetupInProgress()) {
|
| start_stop_button_label =
|
| @@ -246,15 +246,21 @@ void PersonalOptionsHandler::OnStateChanged() {
|
| enabled.reset(Value::CreateBooleanValue(!managed));
|
| dom_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncActionLinkEnabled",
|
| *enabled);
|
| -#endif
|
| +#else
|
| + label.reset(Value::CreateStringValue(string16()));
|
| + dom_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncActionLinkLabel",
|
| + *label);
|
| +#endif // !defined(OS_CHROMEOS)
|
|
|
| visible.reset(Value::CreateBooleanValue(status_has_error));
|
| dom_ui_->CallJavascriptFunction(
|
| L"PersonalOptions.setSyncStatusErrorVisible", *visible);
|
| -#if !defined(OS_CHROMEOS)
|
| +
|
| +#if defined(OS_CHROMEOS)
|
| + visible.reset(Value::CreateBooleanValue(false));
|
| +#endif // defined(OS_CHROMEOS)
|
| dom_ui_->CallJavascriptFunction(
|
| L"PersonalOptions.setSyncActionLinkErrorVisible", *visible);
|
| -#endif
|
| }
|
|
|
| void PersonalOptionsHandler::OnLoginSuccess() {
|
|
|