Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(271)

Unified Diff: chrome/browser/chromeos/status/network_menu.cc

Issue 21046008: Convert all connect code to use NetworkHandler instead of NetworkLibrary (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore check VPN PassphraseRequred Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index e21fe1d782c667528d86bd15838a63f1668fc660..b9afe258244b92e741bb6178ea43120e90a97c8a 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -8,6 +8,7 @@
#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"
@@ -17,7 +18,6 @@
#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"
@@ -219,16 +219,8 @@ class MainMenuModel : public NetworkMenuModel {
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);
}
////////////////////////////////////////////////////////////////////////////////
@@ -349,7 +341,7 @@ void NetworkMenuModel::ShowOther(const std::string& type) const {
if (type == flimflam::kTypeCellular)
ChooseMobileNetworkDialog::ShowDialog(native_window);
else
- NetworkConfigView::ShowForType(chromeos::TYPE_WIFI, native_window);
+ NetworkConfigView::ShowForType(flimflam::kTypeWifi, native_window);
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698