If ethernet is not available (i.e. no wired nic), don't show ethernet in status menu, about:networks, and options pages.

Also fixed a small issue where we should not be displaying "Other..." if wifi is disabled.
BUG=chromium-os:5570
TEST=manual
Review URL: http://codereview.chromium.org/3108011

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

3 files changed, 15 insertions, 3 deletions

diff --git a/chrome/browser/resources/options/chromeos_internet_options.html b/chrome/browser/resources/options/chromeos_internet_options.html
index bcdf3bd..a476c1e 100644
--- a/chrome/browser/resources/options/chromeos_internet_options.html
+++ b/chrome/browser/resources/options/chromeos_internet_options.html
@@ -1,14 +1,14 @@
 <div class="page hidden" id="internetPage">
   <h1 i18n-content="internetPage"></h1>
-  <section>
+  <section id="wiredSection">
     <h3 i18n-content="wired_title"></h3>
     <div class="networks" id="wiredList"></div>
   </section>
-  <section>
+  <section id="wirelessSection">
     <h3 i18n-content="wireless_title"></h3>
     <div class="networks" id="wirelessList"></div>
   </section>
-  <section>
+  <section id="rememberedSection">
     <h3 i18n-content="remembered_title"></h3>
     <div class="networks" id="rememberedList"></div>
   </section>
diff --git a/chrome/browser/resources/options/chromeos_internet_options.js b/chrome/browser/resources/options/chromeos_internet_options.js
index dea5838..9fb2975 100644
--- a/chrome/browser/resources/options/chromeos_internet_options.js
+++ b/chrome/browser/resources/options/chromeos_internet_options.js
@@ -38,6 +38,10 @@ cr.define('options', function() {
       $('wirelessList').load(templateData.wirelessList);
       options.internet.NetworkElement.decorate($('rememberedList'));
       $('rememberedList').load(templateData.rememberedList);
+
+      $('wiredSection').hidden = (templateData.wiredList.length == 0);
+      $('wirelessSection').hidden = (templateData.wirelessList.length == 0);
+      $('rememberedSection').hidden = (templateData.rememberedList.length == 0);
     }
   };
 
@@ -48,6 +52,10 @@ cr.define('options', function() {
     $('wiredList').load(data.wiredList);
     $('wirelessList').load(data.wirelessList);
     $('rememberedList').load(data.rememberedList);
+
+    $('wiredSection').hidden = (data.wiredList.length == 0);
+    $('wirelessSection').hidden = (data.wirelessList.length == 0);
+    $('rememberedSection').hidden = (data.rememberedList.length == 0);
   };
 
   // Export
diff --git a/chrome/browser/resources/options/chromeos_internet_options_page.css b/chrome/browser/resources/options/chromeos_internet_options_page.css
index c09a5f8..04fc82f 100644
--- a/chrome/browser/resources/options/chromeos_internet_options_page.css
+++ b/chrome/browser/resources/options/chromeos_internet_options_page.css
@@ -11,6 +11,10 @@
   width: auto;
 }
 
+#internetPage > section[hidden] {
+  display: none;
+}
+
 .networks {
   -webkit-margin-start: 15px;
   padding: 2px;