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..210d197904a1ac25d6d49b1c661cda5b296334fd 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,7 +246,11 @@ 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( |
@@ -254,7 +258,11 @@ void PersonalOptionsHandler::OnStateChanged() { |
#if !defined(OS_CHROMEOS) |
dom_ui_->CallJavascriptFunction( |
L"PersonalOptions.setSyncActionLinkErrorVisible", *visible); |
-#endif |
+#else |
+ visible.reset(Value::CreateBooleanValue(false)); |
csilv
2011/01/25 20:00:49
suggestion: put the visible.reset() line in an #if
James Hawkins
2011/01/25 20:05:08
Done.
|
+ dom_ui_->CallJavascriptFunction( |
+ L"PersonalOptions.setSyncActionLinkErrorVisible", *visible); |
+#endif // !defined(OS_CHROMEOS) |
} |
void PersonalOptionsHandler::OnLoginSuccess() { |