Push change for stevenjb:...

chrome/browser/chromeos/status/network_menu_button.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 104 matching lines @@
     FLAG_CELLULAR          = 1 << 8,
     FLAG_OPTIONS           = 1 << 9,
     FLAG_OTHER_NETWORK     = 1 << 10,
   };
 
   struct MenuItem {
     MenuItem()
         : type(menus::MenuModel::TYPE_SEPARATOR),
           flags(0) {}
     MenuItem(menus::MenuModel::ItemType type, string16 label, SkBitmap icon,
-             WifiNetwork wifi_network, CellularNetwork cellular_network,
-             int flags)
+             const std::string& wireless_path, int flags)
         : type(type),
           label(label),
           icon(icon),
-          wifi_network(wifi_network),
-          cellular_network(cellular_network),
+          wireless_path(wireless_path),
           flags(flags) {}
 
     menus::MenuModel::ItemType type;
     string16 label;
     SkBitmap icon;
-    WifiNetwork wifi_network;
-    CellularNetwork cellular_network;
+    std::string wireless_path;
     int flags;
   };
   typedef std::vector<MenuItem> MenuItemVector;
 
   // views::ViewMenuDelegate implementation.
   virtual void RunMenu(views::View* source, const gfx::Point& pt);
 
   // Called by RunMenu to initialize our list of menu items.
   void InitMenuItems();
 
@@ skipping 20 matching lines @@
 
   // The duration of the icon throbbing in milliseconds.
   static const int kThrobDuration;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenuButton);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_BUTTON_H_