Change status button menu implementation from Menu2 to MenuItemView.

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>
 
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/native_widget_types.h"
+#include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
 namespace gfx {
 class Canvas;
 }
 
 namespace views {
-class Menu2;
+class MenuItemView;
 }
 
 namespace chromeos {
 
 class NetworkMenu;
 
-class NetworkMenuModel : public ui::MenuModel {
+class NetworkMenuModel : public views::MenuDelegate {

[stevenjb, 2011/04/21 22:25:31]

This should have come up in the CL where this was added, but there is no reason
for NetworkMenuModel to be in network_menu.h; it should be moved into
network_menu.cc and forward declared here.

[rhashimoto, 2011/04/21 22:49:58]

Done.

  public:
   struct NetworkInfo {
     NetworkInfo() :
         need_passphrase(false), remembered(true), auto_connect(true) {}
     // "ethernet" | "wifi" | "cellular" | "other".
     std::string network_type;
     // "connected" | "connecting" | "disconnected" | "error".
     std::string status;
     // status message or error message, empty if unknown status.
     std::string message;
     // IP address (if network is active, empty otherwise)
     std::string ip_address;
     // Remembered passphrase.
     std::string passphrase;
     // true if the network requires a passphrase.
     bool need_passphrase;
     // true if the network is currently remembered.
     bool remembered;
     // true if the network is auto connect (meaningful for Wifi only).
     bool auto_connect;
   };
 
   explicit NetworkMenuModel(NetworkMenu* owner) : owner_(owner) {}
   virtual ~NetworkMenuModel() {}
 
+  // views::MenuDelegate implementation ----------------------------------------
+
+  virtual const gfx::Font& GetLabelFont(int id) const OVERRIDE;
+  virtual bool IsItemChecked(int id) const OVERRIDE;
+  virtual bool IsCommandEnabled(int id) const OVERRIDE;
+  virtual void ExecuteCommand(int id) OVERRIDE;
+
   // Connect or reconnect to the network at |index|.
   // If remember >= 0, set the favorite state of the network.
   // Returns true if a connect occurred (e.g. menu should be closed).
   bool ConnectToNetworkAt(int index,
                           const std::string& passphrase,
                           const std::string& ssid,
                           int remember) const;
 
   // Called by NetworkMenu::RunMenu to initialize list of menu items.
   virtual void InitMenuItems(bool is_browser_mode,
                              bool should_open_button_options) {}
 
-  // ui::MenuModel implementation.
-  virtual bool HasIcons() const  { return true; }
-  virtual int GetItemCount() const;
-  virtual ui::MenuModel::ItemType GetTypeAt(int index) const;
-  virtual int GetCommandIdAt(int index) const { return index; }
-  virtual string16 GetLabelAt(int index) const;
-  virtual bool IsItemDynamicAt(int index) const { return true; }
-  virtual const gfx::Font* GetLabelFontAt(int index) const;
-  virtual bool GetAcceleratorAt(int index,
-      ui::Accelerator* accelerator) const { return false; }
-  virtual bool IsItemCheckedAt(int index) const;
-  virtual int GetGroupIdAt(int index) const { return 0; }
-  virtual bool GetIconAt(int index, SkBitmap* icon);
-  virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const {
-    return NULL;
-  }
-  virtual bool IsEnabledAt(int index) const;
-  virtual ui::MenuModel* GetSubmenuModelAt(int index) const;
-  virtual void HighlightChangedTo(int index) {}
-  virtual void ActivatedAt(int index);
-  virtual void MenuWillShow() {}
-  virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) {}
+  // PopulateMenu() clears and reinstalls the menu items defined in this
+  // instance by calling PopulateMenuItem() on each one.  Subclasses with
+  // submenus should override PopulateMenuItem(), deferring to the base
+  // class implementation for non-submenu items and calling PopulateMenu()
+  // for the submenu after adding it.
+  virtual void PopulateMenu(views::MenuItemView* menu);
+  virtual void PopulateMenuItem(
+      views::MenuItemView* menu,
+      int index,
+      int command_id);
 
  protected:
   enum MenuItemFlags {
     FLAG_DISABLED          = 1 << 0,
     FLAG_TOGGLE_ETHERNET   = 1 << 1,
     FLAG_TOGGLE_WIFI       = 1 << 2,
     FLAG_TOGGLE_CELLULAR   = 1 << 3,
     FLAG_TOGGLE_OFFLINE    = 1 << 4,
     FLAG_ASSOCIATED        = 1 << 5,
     FLAG_ETHERNET          = 1 << 6,
@@ skipping 146 matching lines @@
   // |icon| must be non-NULL.
   // If one of the |bottom_right_badge| or |top_left_badge| or
   // |bottom_left_badge| icons are not NULL, they will be drawn on top of the
   // icon.
   static SkBitmap IconForDisplay(const SkBitmap* icon,
                                  const SkBitmap* bottom_right_badge,
                                  const SkBitmap* top_left_badge,
                                  const SkBitmap* bottom_left_badge);
 
  protected:
+  virtual views::MenuButton* GetMenuButton() = 0;
   virtual gfx::NativeWindow GetNativeWindow() const = 0;
   virtual void OpenButtonOptions() = 0;
   virtual bool ShouldOpenButtonOptions() const = 0;
 
   // Notify subclasses that connection to |network| was initiated.
   virtual void OnConnectNetwork(const Network* network,
                                 SkBitmap selected_icon_) {}
   // Update the menu (e.g. when the network list or status has changed).
   void UpdateMenu();
 
@@ skipping 16 matching lines @@
   // TODO(chocobo): Add this back when we decide to do colored bars again.
   // static const int kBarsImagesVLowData[];
 
   // The number of animating images for network connecting.
   static const int kNumAnimatingImages;
   // Animation images. These are created lazily.
   static SkBitmap kAnimatingImages[];
   static SkBitmap kAnimatingImagesBlack[];
 
   // The network menu.
-  scoped_ptr<views::Menu2> network_menu_;
+  scoped_ptr<views::MenuItemView> network_menu_;
 
   scoped_ptr<NetworkMenuModel> main_menu_model_;
 
   // Holds minimum width or -1 if it wasn't set up.
   int min_width_;
 
   // If true, call into the settings UI for network configuration dialogs.
   bool use_settings_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenu);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_H_