Don't show status text for "remembered" networks and "Connect" button for ethernet.

BUG=chromium-os:6159
TEST=Verify that "Disconnected" is not shown for remembered networks and "Connect" button is not shown for ethernet.

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

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

2 files changed, 15 insertions, 7 deletions

diff --git a/chrome/browser/resources/options/chromeos_internet_network_element.js b/chrome/browser/resources/options/chromeos_internet_network_element.js
index e5dc255..999cb02 100644
--- a/chrome/browser/resources/options/chromeos_internet_network_element.js
+++ b/chrome/browser/resources/options/chromeos_internet_network_element.js
@@ -127,10 +127,13 @@ cr.define('options.internet', function() {
         return;
       }
 
-      var statusEl = this.ownerDocument.createElement('div');
-      statusEl.className = 'network-status-label';
-      statusEl.textContent = this.data.networkStatus;
-      textDiv.appendChild(statusEl);
+      // Only show status text for networks other than "remembered".
+      if (!this.data.remembered) {
+        var statusEl = this.ownerDocument.createElement('div');
+        statusEl.className = 'network-status-label';
+        statusEl.textContent = this.data.networkStatus;
+        textDiv.appendChild(statusEl);
+      }
 
       this.appendChild(textDiv);
 
@@ -150,9 +153,11 @@ cr.define('options.internet', function() {
           buttonsDiv.appendChild(this.createButton_('options_button',
               'options'));
         } else if (!this.data.connecting) {
-          // connect button
-          buttonsDiv.appendChild(this.createButton_('connect_button',
-              'connect'));
+          // connect button (if not ethernet)
+          if (this.data.networkType != 1) {
+            buttonsDiv.appendChild(this.createButton_('connect_button',
+                'connect'));
+          }
         }
       } else {
         // forget button
diff --git a/chrome/browser/resources/options/chromeos_internet_options_page.css b/chrome/browser/resources/options/chromeos_internet_options_page.css
index 04fc82f..b433f64 100644
--- a/chrome/browser/resources/options/chromeos_internet_options_page.css
+++ b/chrome/browser/resources/options/chromeos_internet_options_page.css
@@ -50,9 +50,12 @@
   -webkit-padding-start: 30px;
   background: 0 50% no-repeat;
   cursor: default;
+  display: table-cell;
+  height: 24px;
   line-height: 100%;
   max-width: 320px;
   overflow: hidden;
+  vertical-align: middle;
 }
 
 .network-item[connected] > * > .network-name-label {