Change status button menu implementation from Menu2 to MenuItemView.

chrome/browser/chromeos/status/network_menu_button.cc

 // 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.
 
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/window/window.h"
 
 namespace chromeos {
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton
+// NetworkMenuButton ----------------------------------------------------------
 
 // static
 const int NetworkMenuButton::kThrobDuration = 1000;
 
 NetworkMenuButton::NetworkMenuButton(StatusAreaHost* host)
     : StatusAreaButton(this),
       NetworkMenu(),
       host_(host),
       icon_(NULL),
       badge_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)) {
   animation_connecting_.SetThrobDuration(kThrobDuration);
   animation_connecting_.SetTweenType(ui::Tween::EASE_IN_OUT);
   OnNetworkManagerChanged(CrosLibrary::Get()->GetNetworkLibrary());
   CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
   CrosLibrary::Get()->GetNetworkLibrary()->AddCellularDataPlanObserver(this);
 }
 
 NetworkMenuButton::~NetworkMenuButton() {
   NetworkLibrary* netlib = CrosLibrary::Get()->GetNetworkLibrary();
   netlib->RemoveNetworkManagerObserver(this);
   netlib->RemoveObserverForAllNetworks(this);
   netlib->RemoveCellularDataPlanObserver(this);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, ui::AnimationDelegate implementation:
+// NetworkMenuButton, ui::AnimationDelegate implementation: -------------------
 
 void NetworkMenuButton::AnimationProgressed(const ui::Animation* animation) {
   if (animation == &animation_connecting_) {
     SetIconOnly(IconForNetworkConnecting(
         animation_connecting_.GetCurrentValue(), false));
     // No need to set the badge here, because it should already be set.
     SchedulePaint();
   } else {
     MenuButton::AnimationProgressed(animation);
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, NetworkLibrary::NetworkManagerObserver implementation:
+// NetworkMenuButton, NetworkLibrary::NetworkManagerObserver implementation: --
 
 void NetworkMenuButton::OnNetworkManagerChanged(NetworkLibrary* cros) {
   OnNetworkChanged(cros, cros->active_network());
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, NetworkLibrary::NetworkObserver implementation:
+// NetworkMenuButton, NetworkLibrary::NetworkObserver implementation: ---------
+
 void NetworkMenuButton::OnNetworkChanged(NetworkLibrary* cros,
                                          const Network* network) {
   // This gets called on initialization, so any changes should be reflected
   // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
   SetNetworkIcon(cros, network);
   RefreshNetworkObserver(cros);
   SchedulePaint();
   UpdateMenu();
 }
 
 void NetworkMenuButton::OnCellularDataPlanChanged(NetworkLibrary* cros) {
   // Call OnNetworkManagerChanged which will update the icon.
   OnNetworkManagerChanged(cros);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, NetworkMenu implementation:
+// NetworkMenuButton, NetworkMenu implementation: -----------------------------
 
 bool NetworkMenuButton::IsBrowserMode() const {
   return host_->GetScreenMode() == StatusAreaHost::kBrowserMode;
 }
 
+views::MenuButton* NetworkMenuButton::GetMenuButton() OVERRIDE {
+  return this;
+}
+
 gfx::NativeWindow NetworkMenuButton::GetNativeWindow() const {
   return host_->GetNativeWindow();
 }
 
 void NetworkMenuButton::OpenButtonOptions() {
   host_->OpenButtonOptions(this);
 }
 
 bool NetworkMenuButton::ShouldOpenButtonOptions() const {
   return host_->ShouldOpenButtonOptions(this);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, views::View implementation:
+// NetworkMenuButton, views::View implementation: -----------------------------
 
 void NetworkMenuButton::OnLocaleChanged() {
   NetworkLibrary* lib = CrosLibrary::Get()->GetNetworkLibrary();
   SetNetworkIcon(lib, lib->active_network());
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, private methods
+// NetworkMenuButton, private methods -----------------------------------------
 
 void NetworkMenuButton::SetIconAndBadge(const SkBitmap* icon,
                                         const SkBitmap* badge) {
   icon_ = icon;
   badge_ = badge;
   SetIcon(IconForDisplay(icon_, badge_));
 }
 
 void NetworkMenuButton::SetIconOnly(const SkBitmap* icon) {
   icon_ = icon;
@@ skipping 84 matching lines @@
       cros->RemoveNetworkObserver(active_network_, this);
     }
     if (!new_network.empty()) {
       cros->AddNetworkObserver(new_network, this);
     }
     active_network_ = new_network;
   }
 }
 
 }  // namespace chromeos