Make NetworkMenuModel a ui::MenuModel again.

chrome/browser/chromeos/status/network_menu.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 
 class SkBitmap;
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
 class MenuItemView;
 class MenuButton;
+class MenuModelAdapter;
 }
 
 namespace chromeos {
 
 class NetworkMenuModel;
 
 // Menu for network menu button in the status area/welcome screen.
 // This class will populating the menu with the list of networks.
 // It will also handle connecting to another wifi/cellular network.
 //
@@ skipping 62 matching lines @@
   // Weak ptr to delegate.
   Delegate* delegate_;
 
   // True if the browser is visible (i.e. not login/OOBE).
   bool is_browser_mode_;
 
   // Set to true if we are currently refreshing the menu.
   bool refreshing_menu_;
 
   // The network menu.
+  scoped_ptr<NetworkMenuModel> main_menu_model_;
+  scoped_ptr<views::MenuModelAdapter> menu_model_adapter_;
   scoped_ptr<views::MenuItemView> menu_item_view_;
-  scoped_ptr<NetworkMenuModel> main_menu_model_;
 
   // Holds minimum width of the menu.
   int min_width_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenu);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_