DOMUI/CrOS: Set an empty sync action link label (which has the result of hiding

chrome/browser/dom_ui/options/personal_options_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 184 matching lines @@
   string16 start_stop_button_label;
   bool is_start_stop_button_visible = false;
   bool is_start_stop_button_enabled = false;
   if (sync_setup_completed) {
     start_stop_button_label =
         l10n_util::GetStringUTF16(IDS_SYNC_STOP_SYNCING_BUTTON_LABEL);
 #if defined(OS_CHROMEOS)
     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 =
         l10n_util::GetStringUTF16(IDS_SYNC_NTP_SETUP_IN_PROGRESS);
     is_start_stop_button_visible = true;
     is_start_stop_button_enabled = false;
   } else {
     start_stop_button_label =
         l10n_util::GetStringUTF16(IDS_SYNC_START_SYNC_BUTTON_LABEL);
     is_start_stop_button_visible = true;
@@ skipping 23 matching lines @@
                                   *label);
 
 #if !defined(OS_CHROMEOS)
   label.reset(Value::CreateStringValue(link_label));
   dom_ui_->CallJavascriptFunction(L"PersonalOptions.setSyncActionLinkLabel",
                                   *label);
 
   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)
   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 defined (OS_CHROMEOS) block,
and remove the javascript call from the conditional since it's the same for both
conditions.

[James Hawkins, 2011/01/25 20:05:08]

Done.

+  dom_ui_->CallJavascriptFunction(
+    L"PersonalOptions.setSyncActionLinkErrorVisible", *visible);
+#endif  // !defined(OS_CHROMEOS)
 }
 
 void PersonalOptionsHandler::OnLoginSuccess() {
   OnStateChanged();
 }
 
 void PersonalOptionsHandler::OnLoginFailure(
     const GoogleServiceAuthError& error) {
   OnStateChanged();
 }
@@ skipping 79 matching lines @@
 }
 #endif
 
 void PersonalOptionsHandler::OnPreferredDataTypesUpdated(
     const ListValue* args) {
   NotificationService::current()->Notify(
       NotificationType::SYNC_DATA_TYPES_UPDATED,
       Source<Profile>(dom_ui_->GetProfile()),
       NotificationService::NoDetails());
 }