Convert all connect code to use NetworkHandler instead of NetworkLibrary

chrome/browser/chromeos/status/network_menu.cc

 // Copyright (c) 2012 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 "ash/shell.h"
 #include "ash/shell_delegate.h"
+#include "ash/system/chromeos/network/network_connect.h"
 #include "ash/system/chromeos/network/network_icon.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/choose_mobile_network_dialog.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/mobile_config.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
-#include "chrome/browser/chromeos/options/network_connect.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/url_constants.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
@@ skipping 181 matching lines @@
   scoped_ptr<MoreMenuModel> more_menu_model_;
 
   DISALLOW_COPY_AND_ASSIGN(MainMenuModel);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuModel, public methods:
 
 void NetworkMenuModel::ConnectToNetworkAt(int index) {
   const std::string& service_path = menu_items_[index].service_path;
-  network_connect::ConnectResult result =
-      network_connect::ConnectToNetwork(
-          service_path, owner_->delegate()->GetNativeWindow());
-  if (result == network_connect::NETWORK_NOT_FOUND) {
-    // If we are attempting to connect to a network that no longer exists,
-    // display a notification.
-    LOG(WARNING) << "Network does not exist to connect to: "
-                 << service_path;
-    // TODO(stevenjb): Show notification.
-  }
+  gfx::NativeWindow native_window = owner_->delegate()->GetNativeWindow();
+  ash::network_connect::ConnectToNetwork(service_path, native_window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuModel, ui::MenuModel implementation:
 
 bool NetworkMenuModel::HasIcons() const {
   return true;
 }
 
 int NetworkMenuModel::GetItemCount() const {
@@ skipping 100 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuModel, private methods:
 
 void NetworkMenuModel::ShowOther(const std::string& type) const {
   gfx::NativeWindow native_window = owner_->delegate()->GetNativeWindow();
   if (type == flimflam::kTypeCellular)
     ChooseMobileNetworkDialog::ShowDialog(native_window);
   else
-    NetworkConfigView::ShowForType(chromeos::TYPE_WIFI, native_window);
+    NetworkConfigView::ShowForType(flimflam::kTypeWifi, native_window);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // MainMenuModel
 
 void MainMenuModel::AddWirelessNetworkMenuItem(const NetworkState* network,
                                                int flag) {
   string16 label;
   // Ampersand is a valid character in an SSID, but menu2 uses it to mark
   // "mnemonics" for keyboard shortcuts.
@@ skipping 320 matching lines @@
   return main_menu_model_.get();
 }
 
 void NetworkMenu::UpdateMenu() {
   refreshing_menu_ = true;
   main_menu_model_->InitMenuItems(delegate_->ShouldOpenButtonOptions());
   refreshing_menu_ = false;
 }
 
 }  // namespace chromeos