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

Unified Diff: chrome/browser/dom_ui/options/personal_options_handler.cc

Issue 6389003: DOMUI/CrOS: Set an empty sync action link label (which has the result of hiding (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review fix. Created 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698