Show hardware addresses for wifi and ethernet networks.

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2011 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/logging.h"
 #include "base/command_line.h"
@@ skipping 12 matching lines @@
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/window/window.h"
 
 namespace chromeos {
 
-class MainMenuModel : public NetworkMenuModel {
+class MoreMenuModel : public NetworkMenuModel {
  public:
-  explicit MainMenuModel(NetworkMenu* owner);
-  virtual ~MainMenuModel() {}
+  explicit MoreMenuModel(NetworkMenu* owner);
+  virtual ~MoreMenuModel() {}
 
   // NetworkMenuModel implementation.
   virtual void InitMenuItems(bool is_browser_mode,
                              bool should_open_button_options);
 
  private:
-  scoped_ptr<NetworkMenuModel> vpn_menu_model_;
-
-  DISALLOW_COPY_AND_ASSIGN(MainMenuModel);
+  friend class MainMenuModel;
+  DISALLOW_COPY_AND_ASSIGN(MoreMenuModel);
 };
 
 class VPNMenuModel : public NetworkMenuModel {
  public:
   explicit VPNMenuModel(NetworkMenu* owner);
   virtual ~VPNMenuModel() {}
 
   // NetworkMenuModel implementation.
   virtual void InitMenuItems(bool is_browser_mode,
                              bool should_open_button_options);
 
   static SkBitmap IconForDisplay(const Network* network);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(VPNMenuModel);
 };
 
+class MainMenuModel : public NetworkMenuModel {
+ public:
+  explicit MainMenuModel(NetworkMenu* owner);
+  virtual ~MainMenuModel() {}
+
+  // NetworkMenuModel implementation.
+  virtual void InitMenuItems(bool is_browser_mode,
+                             bool should_open_button_options);
+
+ private:
+  scoped_ptr<NetworkMenuModel> vpn_menu_model_;
+  scoped_ptr<MoreMenuModel> more_menu_model_;
+
+  DISALLOW_COPY_AND_ASSIGN(MainMenuModel);
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuModel, public methods:
 
 bool NetworkMenuModel::ConnectToNetworkAt(int index,
                                           const std::string& passphrase,
                                           const std::string& ssid,
                                           int auto_connect) const {
   int flags = menu_items_[index].flags;
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   const std::string& service_path = menu_items_[index].service_path;
@@ skipping 209 matching lines @@
 }
 
 void NetworkMenuModel::ShowOtherCellular() const {
   ChooseMobileNetworkDialog::ShowDialog(owner_->GetNativeWindow());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MainMenuModel
 
 MainMenuModel::MainMenuModel(NetworkMenu* owner)
-    : NetworkMenuModel(owner) {
-  vpn_menu_model_.reset(new VPNMenuModel(owner));
+    : NetworkMenuModel(owner),
+      vpn_menu_model_(new VPNMenuModel(owner)),
+      more_menu_model_(new MoreMenuModel(owner)) {
 }
 
 void MainMenuModel::InitMenuItems(bool is_browser_mode,
                                   bool should_open_button_options) {
   // This gets called on initialization, so any changes should be reflected
   // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
 
   menu_items_.clear();
 
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
@@ skipping 197 matching lines @@
 
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableVPN)) {
     // If there's a connected network, add submenu for Private Networks.
     const Network* connected_network = cros->connected_network();
     if (connected_network) {
       menu_items_.push_back(MenuItem());  // Separator
       menu_items_.push_back(MenuItem(
           ui::MenuModel::TYPE_SUBMENU,
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_PRIVATE_NETWORKS),
           VPNMenuModel::IconForDisplay(connected_network),
-          vpn_menu_model_.get(), FLAG_PRIVATE_NETWORKS));
+          vpn_menu_model_.get(), FLAG_NONE));
     }
   }
 
   // Enable / disable wireless.
   if (wifi_available || cellular_available) {
     menu_items_.push_back(MenuItem());  // Separator
 
     if (wifi_available) {
       // Add 'Scanning...'
       if (cros->wifi_scanning()) {
@@ skipping 32 matching lines @@
     }
   }
 
   // Offline mode.
   // TODO(chocobo): Uncomment once we figure out how to do offline mode.
   // menu_items_.push_back(MenuItem(cros->offline_mode() ?
   //     ui::MenuModel::TYPE_CHECK : ui::MenuModel::TYPE_COMMAND,
   //     l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OFFLINE_MODE),
   //     SkBitmap(), std::string(), FLAG_TOGGLE_OFFLINE));
 
-  bool connected = cros->Connected();  // always call for test expectations.
-  bool oobe = !should_open_button_options;  // we don't show options for OOBE.
-  // Network settings. (And IP Address)
-  if (!oobe) {
-    menu_items_.push_back(MenuItem());  // Separator
-
-    if (connected) {
-      std::string ip_address = cros->IPAddress();
-      if (!ip_address.empty()) {
-        menu_items_.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
-            ASCIIToUTF16(cros->IPAddress()), SkBitmap(), std::string(),
-                         FLAG_DISABLED));
-      }
+  // Additional links like:
+  // * Network settings;
+  // * IP Address on active interface;
+  // * Hardware addresses for wifi and ethernet.
+  menu_items_.push_back(MenuItem());  // Separator
+  more_menu_model_->InitMenuItems(
+      is_browser_mode, should_open_button_options);
+  if (is_browser_mode) {
+    menu_items_.insert(
+        menu_items_.end(),
+        more_menu_model_->menu_items_.begin(),
+        more_menu_model_->menu_items_.end());
+  } else {
+    if (!more_menu_model_->menu_items_.empty()) {
+      menu_items_.push_back(MenuItem(
+          ui::MenuModel::TYPE_SUBMENU,
+          l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_MORE),
+          SkBitmap(), more_menu_model_.get(), FLAG_NONE));
     }
-
-    label = l10n_util::GetStringUTF16(is_browser_mode ?
-        IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG :
-        IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG);
-    menu_items_.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND, label,
-                                   SkBitmap(), std::string(), FLAG_OPTIONS));
   }
 
   // Recursively call each submenu to populate its own menu items.
   for (size_t i = 0; i < menu_items_.size(); ++i) {
-    if (menu_items_[i].type == ui::MenuModel::TYPE_SUBMENU &&
-        menu_items_[i].sub_menu_model) {
+    if (menu_items_[i].type == ui::MenuModel::TYPE_SUBMENU) {
+      NetworkMenuModel* model = menu_items_[i].sub_menu_model;
+      if (model == NULL)
+        continue;
+      if (model == more_menu_model_.get()) {
+        // This submenu is already initialized.
+        continue;
+      }

[stevenjb, 2011/04/26 17:05:08]

This was designed to be general purpose, but since we only have two sub menus,
and we already have an exception for more_menu_model_, I think it would be more
clear just to call vpn_menu_model_->InitMenuItems() explicitly up where we
insert it and remove this loop?

[Denis Lagno, 2011/04/26 18:04:09]

that's reasonable.  Done.

       menu_items_[i].sub_menu_model->InitMenuItems(is_browser_mode,
                                                    should_open_button_options);
     }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // VPNMenuModel
 
 VPNMenuModel::VPNMenuModel(NetworkMenu* owner)
@@ skipping 95 matching lines @@
     default:
       LOG(WARNING) << "VPN not handled for connection type " << network->type();
       return SkBitmap();
   }
 
   return NetworkMenu::IconForDisplay(icon, bottom_right_badge, top_left_badge,
                                      bottom_left_badge);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// MoreMenuModel
+
+MoreMenuModel::MoreMenuModel(NetworkMenu* owner)
+    : NetworkMenuModel(owner) {
+}
+
+void MoreMenuModel::InitMenuItems(
+    bool is_browser_mode, bool should_open_button_options) {
+  // This gets called on initialization, so any changes should be reflected
+  // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
+
+  menu_items_.clear();
+  MenuItemVector link_items;
+  MenuItemVector address_items;
+
+  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  bool oobe = !should_open_button_options;  // we don't show options for OOBE.
+  if (!oobe) {
+    string16 label = l10n_util::GetStringUTF16(is_browser_mode ?
+        IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG :
+        IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG);
+    link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND, label,
+                                  SkBitmap(), std::string(), FLAG_OPTIONS));
+  }
+
+  bool connected = cros->Connected();  // always call for test expectations.
+  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 (!is_browser_mode) {
+    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(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());
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // NetworkMenu
 
 // static
 const int NetworkMenu::kNumBarsImages = 4;
 
 // NOTE: Use an array rather than just calculating a resource number to avoid
 // creating implicit ordering dependencies on the resource values.
 // static
 const int NetworkMenu::kBarsImages[kNumBarsImages] = {
   IDR_STATUSBAR_NETWORK_BARS1,
@@ skipping 27 matching lines @@
 
 // static
 const int NetworkMenu::kNumAnimatingImages = 10;
 
 // static
 SkBitmap NetworkMenu::kAnimatingImages[kNumAnimatingImages];
 
 // static
 SkBitmap NetworkMenu::kAnimatingImagesBlack[kNumAnimatingImages];
 
-NetworkMenu::NetworkMenu()
-    : min_width_(-1) {
+NetworkMenu::NetworkMenu() : min_width_(-1) {
   main_menu_model_.reset(new MainMenuModel(this));
   network_menu_.reset(new views::Menu2(main_menu_model_.get()));
 }
 
 NetworkMenu::~NetworkMenu() {
 }
 
 void NetworkMenu::SetFirstLevelMenuWidth(int width) {
   min_width_ = width;
   // This actually has no effect since menu is rebuilt before showing.
@@ skipping 222 matching lines @@
   // Restore menu width, if it was set up.
   // NOTE: width isn't checked for correctness here since all width-related
   // logic implemented inside |network_menu_|.
   if (min_width_ != -1)
     network_menu_->SetMinimumWidth(min_width_);
   refreshing_menu_ = false;
   network_menu_->RunMenuAt(pt, views::Menu2::ALIGN_TOPRIGHT);
 }
 
 }  // namespace chromeos
+
+