DOMUI Settings: UTH: Section seperators are wrong if the last section is hidden.

chrome/browser/dom_ui/options/advanced_options_handler.cc

 // Copyright (c) 2010 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/advanced_options_handler.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "base/basictypes.h"
@@ skipping 187 matching lines @@
   SetupDownloadLocationPath();
   SetupAutoOpenFileTypesDisabledAttribute();
   SetupProxySettingsSection();
 #if defined(OS_WIN)
   SetupSSLConfigSettings();
 #endif
 #if !defined(OS_CHROMEOS)
   if (cloud_print_proxy_ui_enabled_) {
     SetupCloudPrintProxySection();
     RefreshCloudPrintStatusFromService();
+  } else {
+    RemoveCloudPrintProxySection();
   }
 #endif
   banner_handler_.reset(
       new OptionsManagedBannerHandler(dom_ui_,
                                       ASCIIToUTF16("AdvancedOptions"),
                                       OPTIONS_PAGE_ADVANCED));
 }
 
 DOMMessageHandler* AdvancedOptionsHandler::Attach(DOMUI* dom_ui) {
   // Call through to superclass.
@@ skipping 245 matching lines @@
 void AdvancedOptionsHandler::RefreshCloudPrintStatusFromService() {
   DCHECK(dom_ui_);
   if (cloud_print_proxy_ui_enabled_)
     dom_ui_->GetProfile()->GetCloudPrintProxyService()->
         RefreshStatusFromService();
 }
 
 void AdvancedOptionsHandler::SetupCloudPrintProxySection() {
   if (NULL == dom_ui_->GetProfile()->GetCloudPrintProxyService()) {
     cloud_print_proxy_ui_enabled_ = false;
-    dom_ui_->CallJavascriptFunction(
-        L"options.AdvancedOptions.HideCloudPrintProxySection");
+    RemoveCloudPrintProxySection();
     return;
   }
 
   std::string email;
   if (dom_ui_->GetProfile()->GetPrefs()->HasPrefPath(prefs::kCloudPrintEmail))
     email = dom_ui_->GetProfile()->GetPrefs()->GetString(
         prefs::kCloudPrintEmail);
   FundamentalValue disabled(email.empty());
 
   string16 label_str;
   if (email.empty()) {
     label_str = l10n_util::GetStringUTF16(
         IDS_OPTIONS_CLOUD_PRINT_PROXY_DISABLED_LABEL);
   } else {
     label_str = l10n_util::GetStringFUTF16(
         IDS_OPTIONS_CLOUD_PRINT_PROXY_ENABLED_LABEL, UTF8ToUTF16(email));
   }
   StringValue label(label_str);
 
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetupCloudPrintProxySection",
       disabled, label);
 }
+
+void AdvancedOptionsHandler::RemoveCloudPrintProxySection() {
+  dom_ui_->CallJavascriptFunction(
+      L"options.AdvancedOptions.RemoveCloudPrintProxySection");
+}
+
 #endif
 
 void AdvancedOptionsHandler::SetupMetricsReportingCheckbox() {
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
   FundamentalValue checked(enable_metrics_recording_.GetValue());
   FundamentalValue disabled(enable_metrics_recording_.IsManaged());
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetMetricsReportingCheckboxState", checked,
       disabled);
 #endif
@@ skipping 92 matching lines @@
   FundamentalValue useSSL3Value(useSSL3Setting);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetUseSSL3CheckboxState",
       useSSL3Value, disabledValue);
   FundamentalValue useTLS1Value(useTLS1Setting);
   dom_ui_->CallJavascriptFunction(
       L"options.AdvancedOptions.SetUseTLS1CheckboxState",
       useTLS1Value, disabledValue);
 }
 #endif