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

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: 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..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() {
« 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