Change status button menu implementation from Menu2 to MenuItemView.

chrome/browser/chromeos/status/network_dropdown_button.cc

 // Copyright (c) 2010 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_dropdown_button.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 {
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkDropdownButton
+// NetworkDropdownButton ------------------------------------------------------
 
 // static
 const int NetworkDropdownButton::kThrobDuration = 1000;
 
 NetworkDropdownButton::NetworkDropdownButton(bool browser_mode,
                                              gfx::NativeWindow parent_window)
     : DropDownButton(NULL,
                      UTF16ToWide(l10n_util::GetStringUTF16(
                          IDS_STATUSBAR_NO_NETWORKS_MESSAGE)),
                      this,
                      true),
       browser_mode_(browser_mode),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)),
       parent_window_(parent_window) {
   animation_connecting_.SetThrobDuration(kThrobDuration);
   animation_connecting_.SetTweenType(ui::Tween::EASE_IN_OUT);
   CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
   // The initial state will be updated on Refresh.
   // See network_selection_view.cc.
 }
 
 NetworkDropdownButton::~NetworkDropdownButton() {
   CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NetworkMenuButton, ui::AnimationDelegate implementation:
+// NetworkMenuButton, ui::AnimationDelegate implementation: -------------------
 
 void NetworkDropdownButton::AnimationProgressed(
     const ui::Animation* animation) {
   if (animation == &animation_connecting_) {
     SetIcon(*IconForNetworkConnecting(animation_connecting_.GetCurrentValue(),
                                       true));
     SchedulePaint();
   } else {
     MenuButton::AnimationProgressed(animation);
   }
 }
 
 void NetworkDropdownButton::Refresh() {
   OnNetworkManagerChanged(CrosLibrary::Get()->GetNetworkLibrary());
 }
 
-////////////////////////////////////////////////////////////////////////////////
+// NetworkDropdownButton, NetworkMenu implementation: -------------------------
+bool NetworkDropdownButton::IsBrowserMode() const OVERRIDE {
+  return browser_mode_;
+}
+
+views::MenuButton* NetworkDropdownButton::GetMenuButton() OVERRIDE {
+  return this;
+}
+
+gfx::NativeWindow NetworkDropdownButton::GetNativeWindow() OVERRIDE const {
+  return parent_window_;
+}
+
+void NetworkDropdownButton::OpenButtonOptions() OVERRIDE {
+}
+
+bool NetworkDropdownButton::ShouldOpenButtonOptions() OVERRIDE const {
+  return false;
+}
+
 // NetworkDropdownButton, NetworkLibrary::NetworkManagerObserver implementation:
 
 void NetworkDropdownButton::OnNetworkManagerChanged(NetworkLibrary* cros) {
   // Show network that we will actually use. It could be another network than
   // user selected. For example user selected WiFi network but we have Ethernet
   // connection and Chrome OS device will actually use Ethernet.
 
   // This gets called on initialization, so any changes should be reflected
   // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
 
@@ skipping 43 matching lines @@
     SetIcon(SkBitmap());
     SetText(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NO_NETWORKS_MESSAGE)));
   }
 
   SchedulePaint();
   UpdateMenu();
 }
 
 }  // namespace chromeos