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

BUG = 67347
TEST = none

Review URL: http://codereview.chromium.org/5976010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70235 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 4 deletions

diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index 9531d84..e4acf17 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -205,6 +205,8 @@ void AdvancedOptionsHandler::Initialize() {
   if (cloud_print_proxy_ui_enabled_) {
     SetupCloudPrintProxySection();
     RefreshCloudPrintStatusFromService();
+  } else {
+    RemoveCloudPrintProxySection();
   }
 #endif
   banner_handler_.reset(
@@ -470,8 +472,7 @@ void AdvancedOptionsHandler::RefreshCloudPrintStatusFromService() {
 void AdvancedOptionsHandler::SetupCloudPrintProxySection() {
   if (NULL == dom_ui_->GetProfile()->GetCloudPrintProxyService()) {
     cloud_print_proxy_ui_enabled_ = false;
-    dom_ui_->CallJavascriptFunction(
-        L"options.AdvancedOptions.HideCloudPrintProxySection");
+    RemoveCloudPrintProxySection();
     return;
   }
 
@@ -495,6 +496,12 @@ void AdvancedOptionsHandler::SetupCloudPrintProxySection() {
       L"options.AdvancedOptions.SetupCloudPrintProxySection",
       disabled, label);
 }
+
+void AdvancedOptionsHandler::RemoveCloudPrintProxySection() {
+  dom_ui_->CallJavascriptFunction(
+      L"options.AdvancedOptions.RemoveCloudPrintProxySection");
+}
+
 #endif
 
 void AdvancedOptionsHandler::SetupMetricsReportingCheckbox() {
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.h b/chrome/browser/dom_ui/options/advanced_options_handler.h
index 0de52ab..22df2bd 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.h
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.h
@@ -113,6 +113,11 @@ class AdvancedOptionsHandler
   // Setup the enabled or disabled state of the cloud print proxy
   // management UI.
   void SetupCloudPrintProxySection();
+
+  // Remove cloud print proxy section if cloud print proxy management UI is
+  // disabled.
+  void RemoveCloudPrintProxySection();
+
 #endif
 
   // Setup the checked state for the metrics reporting checkbox.
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index 0d52a90..d6348ee 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -251,9 +251,10 @@ var OptionsPage = options.OptionsPage;
     }
   };
 
-  AdvancedOptions.HideCloudPrintProxySection = function() {
+  AdvancedOptions.RemoveCloudPrintProxySection = function() {
     if (!cr.isChromeOS) {
-      $('cloud-print-proxy-section').style.display = 'none';
+      var proxySectionElm = $('cloud-print-proxy-section');
+      proxySectionElm.parentNode.removeChild(proxySectionElm);
     }
   };