Change status button menu implementation from Menu2 to MenuItemView.

chrome/browser/chromeos/status/network_dropdown_button.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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_DROPDOWN_BUTTON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_
 #pragma once
 
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/chromeos/views/dropdown_button.h"
@@ skipping 17 matching lines @@
   virtual void AnimationProgressed(const ui::Animation* animation);
 
   // NetworkLibrary::NetworkManagerObserver implementation.
   virtual void OnNetworkManagerChanged(NetworkLibrary* obj);
 
   // Refreshes button state. Used when language has been changed.
   void Refresh();
 
  protected:
   // NetworkMenu implementation:
-  virtual bool IsBrowserMode() const { return browser_mode_; }
-  virtual gfx::NativeWindow GetNativeWindow() const { return parent_window_; }
-  virtual void OpenButtonOptions() {}
-  virtual bool ShouldOpenButtonOptions() const { return false; }
+  virtual bool IsBrowserMode() const OVERRIDE { return browser_mode_; }
+  virtual views::MenuButton* GetMenuButton() OVERRIDE { return this; }
+  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE const {
+    return parent_window_;
+  }

[oshima, 2011/04/15 22:26:51]

actually, can you move implementations to .cc? We're trying to eliminate
inlined virtual functions. (to reduce binary size)

[rhashimoto, 2011/04/15 23:44:32]

Done.

+
+  virtual void OpenButtonOptions() OVERRIDE {}
+  virtual bool ShouldOpenButtonOptions() OVERRIDE const { return false; }
 
  private:
   bool browser_mode_;
 
   // The throb animation that does the wifi connecting animation.
   ui::ThrobAnimation animation_connecting_;
 
   // The duration of the icon throbbing in milliseconds.
   static const int kThrobDuration;
 
   gfx::NativeWindow parent_window_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkDropdownButton);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_DROPDOWN_BUTTON_H_