Remove WebUI menu

chrome/browser/chromeos/status/network_menu.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.h"
 
 #include <algorithm>
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/webui/network_menu_ui.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/browser/ui/views/window.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
@@ skipping 59 matching lines @@
 const int NetworkMenu::kNumAnimatingImages = 10;
 
 // static
 SkBitmap NetworkMenu::kAnimatingImages[kNumAnimatingImages];
 
 // static
 SkBitmap NetworkMenu::kAnimatingImagesBlack[kNumAnimatingImages];
 
 NetworkMenu::NetworkMenu()
     : min_width_(-1) {
-  network_menu_.reset(NetworkMenuUI::CreateMenu2(this));
+  network_menu_.reset(new views::Menu2(this));
 }
 
 NetworkMenu::~NetworkMenu() {
 }
 
 bool NetworkMenu::GetNetworkAt(int index, NetworkInfo* info) const {
   DCHECK(info);
   bool res = true;  // True unless a network doesn't exist.
   int flags = menu_items_[index].flags;
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
@@ skipping 139 matching lines @@
         return true;
       }
       // Clicked on a disconnected cellular network, so connect to it.
       cros->ConnectToCellularNetwork(cellular);
     } else {
       // If we are attempting to connect to a network that no longer exists,
       // display a notification.
       // TODO(stevenjb): Show notification.
     }
   } else if (flags & FLAG_OTHER_NETWORK) {
-    if (MenuUI::IsEnabled()) {
-      // default is true
-      bool auto_connect_bool = auto_connect == 0 ? false : true;
-      cros->ConnectToWifiNetwork(
-          passphrase.empty() ? SECURITY_NONE : SECURITY_UNKNOWN,
-          ssid, passphrase, std::string(), std::string(), auto_connect_bool);
-    } else {
-      ShowOther();
-    }
+    ShowOther();
   }
   return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenu, ui::MenuModel implementation:
 
 int NetworkMenu::GetItemCount() const {
   return static_cast<int>(menu_items_.size());
 }
@@ skipping 495 matching lines @@
   //     ui::MenuModel::TYPE_CHECK : ui::MenuModel::TYPE_COMMAND,
   //     l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OFFLINE_MODE),
   //     SkBitmap(), std::string(), FLAG_TOGGLE_OFFLINE));
 
   bool connected = cros->Connected();  // always call for test expectations.
   bool oobe = !ShouldOpenButtonOptions();  // we don't show options for OOBE.
   // Network settings. (And IP Address)
   if (!oobe) {
     menu_items_.push_back(MenuItem());  // Separator
 
-    if (!MenuUI::IsEnabled() && connected) {
+    if (connected) {
       std::string ip_address = cros->IPAddress();
       if (!ip_address.empty()) {
         menu_items_.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
             ASCIIToUTF16(cros->IPAddress()), SkBitmap(), std::string(),
                          FLAG_DISABLED));
       }
     }
 
     label = l10n_util::GetStringUTF16(IsBrowserMode() ?
         IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG :
@@ skipping 29 matching lines @@
 
 void NetworkMenu::ActivateCellular(const CellularNetwork* cellular) const {
   DCHECK(cellular);
   Browser* browser = BrowserList::GetLastActive();
   if (!browser)
     return;
   browser->OpenMobilePlanTabAndActivate();
 }
 
 void NetworkMenu::ShowOther() const {
-  if (MenuUI::IsEnabled()) {
-    Browser* browser = BrowserList::GetLastActive();
-    if (browser) {
-      std::string page = StringPrintf("%s?networkType=%d",
-                                      chrome::kInternetOptionsSubPage,
-                                      chromeos::TYPE_WIFI);
-      browser->ShowOptionsTab(page);
-    }
-  } else {
-    ShowNetworkConfigView(new NetworkConfigView());
-  }
+  ShowNetworkConfigView(new NetworkConfigView());
 }
 
 }  // namespace chromeos