chromeos: Remove old status-area related code.

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2012 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/chromeos/status/network_menu.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/chromeos/status/network_menu_icon.h"
-#include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/dialog_style.h"
 #include "chrome/browser/ui/views/window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ skipping 587 matching lines @@
   if (cellular_available && cellular_enabled) {
     const CellularNetworkVector& cell_networks = cros->cellular_networks();
     const CellularNetwork* active_cellular = cros->cellular_network();
 
     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 we are on the OOBE/login screen, do not show activating 3G option.
-      if (!StatusAreaViewChromeos::IsBrowserMode() &&
-          activation_state != ACTIVATION_STATE_ACTIVATED)
+      // This is currently only used in the OOBE/login screen, do not show
+      // activating 3G option.
+      if (activation_state != ACTIVATION_STATE_ACTIVATED)
         continue;
 
       // Ampersand is a valid character in a network name, but menu2 uses it
       // to mark "mnemonics" for keyboard shortcuts.  http://crosbug.com/14697
       std::string network_name = EscapeAmpersands(cell_networks[i]->name());
       if (activation_state == ACTIVATION_STATE_NOT_ACTIVATED ||
           activation_state == ACTIVATION_STATE_PARTIALLY_ACTIVATED) {
         label = l10n_util::GetStringFUTF16(
             IDS_STATUSBAR_NETWORK_DEVICE_ACTIVATE,
             UTF8ToUTF16(network_name));
@@ skipping 44 matching lines @@
         if (label.length()) {
           menu_items_.push_back(
               MenuItem(ui::MenuModel::TYPE_COMMAND,
                        label, SkBitmap(),
                        std::string(), FLAG_DISABLED));
         }
       }
     }
     const NetworkDevice* cellular_device = cros->FindCellularDevice();
     if (cellular_device) {
-      // Add "View Account" with top up URL if we know that.
-      MobileConfig* config = MobileConfig::GetInstance();
-      if (StatusAreaViewChromeos::IsBrowserMode() && config->IsReady()) {
-        std::string carrier_id = cros->GetCellularHomeCarrierId();
-        // If we don't have top up URL cached.
-        if (carrier_id != carrier_id_) {
-          // Mark that we've checked this carrier ID.
-          carrier_id_ = carrier_id;
-          top_up_url_.clear();
-          const MobileConfig::Carrier* carrier = config->GetCarrier(carrier_id);
-          if (carrier && !carrier->top_up_url().empty())
-            top_up_url_ = carrier->top_up_url();
-        }
-        if (!top_up_url_.empty()) {
-          menu_items_.push_back(MenuItem(
-              ui::MenuModel::TYPE_COMMAND,
-              l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_VIEW_ACCOUNT),
-              SkBitmap(),
-              std::string(), FLAG_VIEW_ACCOUNT));
-        }
-      }
+      // NOTE: This is currently only used in login/OOBE screen. So do not add
+      // "View Account" with top up URL.
 
       if (cellular_device->support_network_scan()) {
         // For GSM add mobile network scan.
         if (!separator_added && !menu_items_.empty())
           menu_items_.push_back(MenuItem());
 
         menu_items_.push_back(MenuItem(
             ui::MenuModel::TYPE_COMMAND,
             l10n_util::GetStringUTF16(
                 IDS_OPTIONS_SETTINGS_OTHER_CELLULAR_NETWORKS),
             NetworkMenuIcon::GetDisconnectedBitmap(NetworkMenuIcon::BARS,
                                                    NetworkMenuIcon::COLOR_DARK),
             std::string(), FLAG_ADD_CELLULAR));
       }
     }
   }
 
   // No networks available message.
   if (menu_items_.empty()) {
     label = l10n_util::GetStringFUTF16(IDS_STATUSBAR_NETWORK_MENU_ITEM_INDENT,
                 l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE));
     menu_items_.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND, label,
         SkBitmap(), std::string(), FLAG_DISABLED));
   }
 
-  // If we are logged in and there is a connected network or a connected VPN,
-  // add submenu for Private Networks.
-  if (StatusAreaViewChromeos::IsBrowserMode()) {
-    if (cros->connected_network() || cros->virtual_network_connected()) {
-      menu_items_.push_back(MenuItem());  // Separator
-      const SkBitmap icon = NetworkMenuIcon::GetVpnBitmap();
-      menu_items_.push_back(MenuItem(
-          ui::MenuModel::TYPE_SUBMENU,
-          l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_PRIVATE_NETWORKS),
-          icon, vpn_menu_model_.get(), FLAG_NONE));
-      vpn_menu_model_->InitMenuItems(should_open_button_options);
-    }
-  }
-
   bool show_wifi_scanning = wifi_available && cros->wifi_scanning();
   // Do not show disable wifi during oobe
   bool show_toggle_wifi = wifi_available &&
       (should_open_button_options || !wifi_enabled);
   // Do not show disable cellular during oobe
   bool show_toggle_cellular = cellular_available &&
       (should_open_button_options || !cellular_enabled);
 
   if (show_wifi_scanning || show_toggle_wifi || show_toggle_cellular) {
     menu_items_.push_back(MenuItem());  // Separator
@@ skipping 53 matching lines @@
   //     l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OFFLINE_MODE),
   //     SkBitmap(), std::string(), FLAG_TOGGLE_OFFLINE));
 
   // Additional links like:
   // * Network settings;
   // * IP Address on active interface;
   // * Hardware addresses for wifi and ethernet.
   more_menu_model_->InitMenuItems(should_open_button_options);
   if (!more_menu_model_->menu_items().empty()) {
     menu_items_.push_back(MenuItem());  // Separator
-    if (StatusAreaViewChromeos::IsBrowserMode()) {
-      // In browser mode we do not want separate submenu, inline items.
-      menu_items_.insert(
-          menu_items_.end(),
-          more_menu_model_->menu_items().begin(),
-          more_menu_model_->menu_items().end());
-    } else {
-      menu_items_.push_back(MenuItem(
-          ui::MenuModel::TYPE_SUBMENU,
-          l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_MORE),
-          SkBitmap(), more_menu_model_.get(), FLAG_NONE));
-    }
+    menu_items_.push_back(MenuItem(
+        ui::MenuModel::TYPE_SUBMENU,
+        l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_MORE),
+        SkBitmap(), more_menu_model_.get(), FLAG_NONE));
   }
 }
 
 int MainMenuModel::GetCommandIdAt(int index) const {
   return index + kMainIndexMask;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // VPNMenuModel
 
@@ skipping 65 matching lines @@
   // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
 
   menu_items_.clear();
   MenuItemVector link_items;
   MenuItemVector address_items;
 
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   bool connected = cros->Connected();  // always call for test expectations.
 
   int message_id = -1;
-  if (StatusAreaViewChromeos::IsBrowserMode())
-    message_id = IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG;
-  else if (connected)
+  if (connected)
     message_id = IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG;
   if (message_id != -1) {
     link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
                                   l10n_util::GetStringUTF16(message_id),
                                   SkBitmap(), std::string(), FLAG_OPTIONS));
   }
 
   if (connected) {
     std::string ip_address = cros->IPAddress();
     if (!ip_address.empty()) {
       address_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
           ASCIIToUTF16(cros->IPAddress()), SkBitmap(), std::string(),
                        FLAG_DISABLED));
     }
   }
 
-  if (!StatusAreaViewChromeos::IsBrowserMode()) {
-    const NetworkDevice* ether = cros->FindEthernetDevice();
-    if (ether) {
+  const NetworkDevice* ether = cros->FindEthernetDevice();
+  if (ether) {
+    std::string hardware_address;
+    cros->GetIPConfigs(ether->device_path(), &hardware_address,
+        NetworkLibrary::FORMAT_COLON_SEPARATED_HEX);
+    if (!hardware_address.empty()) {
+      std::string label = l10n_util::GetStringUTF8(
+          IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET) + " " + hardware_address;
+      address_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
+          UTF8ToUTF16(label), SkBitmap(), std::string(), FLAG_DISABLED));
+    }
+  }
+
+  if (cros->wifi_enabled()) {
+    const NetworkDevice* wifi = cros->FindWifiDevice();
+    if (wifi) {
       std::string hardware_address;
-      cros->GetIPConfigs(ether->device_path(), &hardware_address,
-          NetworkLibrary::FORMAT_COLON_SEPARATED_HEX);
+      cros->GetIPConfigs(wifi->device_path(),
+          &hardware_address, NetworkLibrary::FORMAT_COLON_SEPARATED_HEX);
       if (!hardware_address.empty()) {
         std::string label = l10n_util::GetStringUTF8(
-            IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET) + " " + hardware_address;
+            IDS_STATUSBAR_NETWORK_DEVICE_WIFI) + " " + hardware_address;
         address_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
             UTF8ToUTF16(label), SkBitmap(), std::string(), FLAG_DISABLED));
       }
     }
-
-    if (cros->wifi_enabled()) {
-      const NetworkDevice* wifi = cros->FindWifiDevice();
-      if (wifi) {
-        std::string hardware_address;
-        cros->GetIPConfigs(wifi->device_path(),
-            &hardware_address, NetworkLibrary::FORMAT_COLON_SEPARATED_HEX);
-        if (!hardware_address.empty()) {
-          std::string label = l10n_util::GetStringUTF8(
-              IDS_STATUSBAR_NETWORK_DEVICE_WIFI) + " " + hardware_address;
-          address_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
-              UTF8ToUTF16(label), SkBitmap(), std::string(), FLAG_DISABLED));
-        }
-      }
-    }
   }
 
   menu_items_ = link_items;
   if (!menu_items_.empty() && address_items.size() > 1)
     menu_items_.push_back(MenuItem());  // Separator
   menu_items_.insert(menu_items_.end(),
       address_items.begin(), address_items.end());
 }
 
 int MoreMenuModel::GetCommandIdAt(int index) const {
@@ skipping 143 matching lines @@
 
 void NetworkMenu::ShowOtherCellular() {
   ChooseMobileNetworkDialog::ShowDialog(delegate_->GetNativeWindow());
 }
 
 bool NetworkMenu::ShouldHighlightNetwork(const Network* network) {
   return ::ShouldHighlightNetwork(network);
 }
 
 }  // namespace chromeos