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/simple_menu_model.h"
+#include "ui/base/models/menu_model.h"
 #include "ui/gfx/native_widget_types.h"
+#include "views/controls/button/menu_button.h"
+#include "views/controls/menu/menu_delegate.h"
 #include "views/controls/menu/view_menu_delegate.h"
 
 namespace gfx {
 class Canvas;
 }
 
-namespace views {
-class Menu2;
-}
-
 namespace chromeos {
 
 // 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.
 //
 // The network menu looks like this:
 //
 // <icon>  Ethernet
 // <icon>  Wifi Network A
 // <icon>  Wifi Network B
 // <icon>  Wifi Network C
 // <icon>  Cellular Network A
 // <icon>  Cellular Network B
 // <icon>  Cellular Network C
 // <icon>  Other...
 // --------------------------------
 //         Disable Wifi
 //         Disable Celluar
 // --------------------------------
 //         <IP Address>
 //         Network settings...
 //
 // <icon> will show the strength of the wifi/cellular networks.
 // The label will be BOLD if the network is currently connected.
-class NetworkMenu : public views::ViewMenuDelegate,
-                    public ui::MenuModel {
+class NetworkMenu : public views::MenuDelegate,
+                    public views::ViewMenuDelegate {
  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;
@@ skipping 17 matching lines @@
   bool GetNetworkAt(int index, NetworkInfo* info) const;
 
   // 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;
 
-  // 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 { return NULL; }
-  virtual void HighlightChangedTo(int index) {}
-  virtual void ActivatedAt(int index);
-  virtual void MenuWillShow() {}
-  virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) {}
+  // views::MenuDelegate implementation
+  virtual std::wstring GetLabel(int id) const;

[oshima, 2011/04/14 17:27:31]

OVERRIDE

[rhashimoto, 2011/04/14 18:27:04]

Done.

+  virtual const gfx::Font* GetLabelFont(int id) const;
+  virtual bool IsItemChecked(int id) const;
+  virtual bool IsCommandEnabled(int id) const;
+  virtual void ExecuteCommand(int id);
 
   void SetFirstLevelMenuWidth(int width);
 
   // Cancels the active menu.
   void CancelMenu();
 
   // The following methods returns pointer to a shared instance of the SkBitmap.
   // This shared bitmap is owned by the resource bundle and should not be freed.
 
   // Returns the Icon for a network strength for a WifiNetwork |wifi|.
@@ skipping 32 matching lines @@
   // This method will convert the |icon| bitmap to the correct size for display.
   // |icon| must be non-NULL.
   // If one of the |bottom_right_badge| or |top_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);
 
  protected:
   virtual bool IsBrowserMode() const = 0;
+  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 64 matching lines @@
   // The number of animating images for network connecting.
   static const int kNumAnimatingImages;
   // Animation images. These are created lazily.
   static SkBitmap kAnimatingImages[];
   static SkBitmap kAnimatingImagesBlack[];
 
   // Our menu items.
   MenuItemVector menu_items_;
 
   // The network menu.
-  scoped_ptr<views::Menu2> network_menu_;
+  scoped_ptr<views::MenuItemView> network_menu_;
 
   // 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_