Make NetworkMenuModel a ui::MenuModel again.

views/controls/menu/menu_item_view.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 VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 304 matching lines @@
   // Returns the amount of space needed to accomodate the accelerator. The
   // space needed for the accelerator is NOT included in the preferred width.
   int GetAcceleratorTextWidth();
 
   // Returns true if the menu has mnemonics. This only useful on the root menu
   // item.
   bool has_mnemonics() const { return has_mnemonics_; }
 
   // Set top and bottom margins in pixels.  If no margin is set or a
   // negative margin is specified then MenuConfig values are used.
-  void set_margins(int top_margin, int bottom_margin) {
-    top_margin_ = top_margin;
-    bottom_margin_ = bottom_margin;
-  }
+  void SetMargins(int top_margin, int bottom_margin);
 
   // Set the position of the menu with respect to the bounds (top
   // level only).
   void set_menu_position(MenuPosition menu_position) {
     requested_menu_position_ = menu_position;
   }
 
  protected:
   // Creates a MenuItemView. This is used by the various AddXXX methods.
   MenuItemView(MenuItemView* parent, int command, Type type);
@@ skipping 154 matching lines @@
   // position of the menu being shown.
   MenuPosition requested_menu_position_;
   MenuPosition actual_menu_position_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_