Merge 65464 - Don't show activate 3G from login screen.

BUG=chromium-os:8878
TEST=manual
Review URL: http://codereview.chromium.org/4694004

TBR=chocobo@chromium.org
Review URL: http://codereview.chromium.org/4703002

git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@65466 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 5 deletions

diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 8b3c2fc..8192e18 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -544,16 +544,17 @@ void NetworkMenu::InitMenuItems() {
     const CellularNetworkVector& cell_networks = cros->cellular_networks();
     const CellularNetwork* active_cellular = cros->cellular_network();
 
-    if (cell_networks.size() > 0) {
-      no_networks = false;
-      // Separator
-      menu_items_.push_back(MenuItem());
-    }
+    bool separator_added = false;
     // List Cellular networks.
     for (size_t i = 0; i < cell_networks.size(); ++i) {
       chromeos::ActivationState activation_state =
           cell_networks[i]->activation_state();
       if (activation_state == ACTIVATION_STATE_NOT_ACTIVATED) {
+        // If we are on the login screen, do not show activating 3G option.
+        // TODO(chocobo): We are currently using ShouldOpenButtonOptions() to
+        //   tell whether or not we are at the login screen. We need to fix it.
+        if (!ShouldOpenButtonOptions())
+          continue;
         label = l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_DEVICE_ACTIVATE,
             ASCIIToUTF16(cell_networks[i]->name()));
@@ -571,6 +572,14 @@ void NetworkMenu::InitMenuItems() {
       } else {
         label = ASCIIToUTF16(cell_networks[i]->name());
       }
+
+      // First add a separator if necessary.
+      if (!separator_added) {
+        no_networks = false;
+        menu_items_.push_back(MenuItem());
+        separator_added = true;
+      }
+
       SkBitmap icon = IconForNetworkStrength(cell_networks[i]->strength(),
                                              true);
       SkBitmap badge = BadgeForNetworkTechnology(cell_networks[i]);