Update screen is skipped even if user clicks on Ethernet.

BUG=252011
TEST=manual tests on Lumpy

Review URL: https://chromiumcodereview.appspot.com/23514028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221236 0039d316-1c4b-4281-b951-d872f2087c98
parent b907ff2b
...@@ -214,7 +214,6 @@ void NetworkMenuModel::ConnectToNetworkAt(int index) { ...@@ -214,7 +214,6 @@ void NetworkMenuModel::ConnectToNetworkAt(int index) {
const std::string& service_path = menu_items_[index].service_path; const std::string& service_path = menu_items_[index].service_path;
gfx::NativeWindow native_window = owner_->delegate()->GetNativeWindow(); gfx::NativeWindow native_window = owner_->delegate()->GetNativeWindow();
ash::network_connect::ConnectToNetwork(service_path, native_window); ash::network_connect::ConnectToNetwork(service_path, native_window);
owner_->delegate()->OnConnectToNetworkRequested(service_path);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
...@@ -310,9 +309,12 @@ void NetworkMenuModel::ActivatedAt(int index) { ...@@ -310,9 +309,12 @@ void NetworkMenuModel::ActivatedAt(int index) {
} else if (flags & FLAG_TOGGLE_MOBILE) { } else if (flags & FLAG_TOGGLE_MOBILE) {
ToggleTechnology(NetworkStateHandler::kMatchTypeMobile); ToggleTechnology(NetworkStateHandler::kMatchTypeMobile);
} else if (flags & FLAG_ETHERNET) { } else if (flags & FLAG_ETHERNET) {
// Do nothing (used in login screen only) owner_->delegate()->OnConnectToNetworkRequested(
menu_items_[index].service_path);
} else if (flags & (FLAG_WIFI | FLAG_WIMAX | FLAG_CELLULAR)) { } else if (flags & (FLAG_WIFI | FLAG_WIMAX | FLAG_CELLULAR)) {
ConnectToNetworkAt(index); ConnectToNetworkAt(index);
owner_->delegate()->OnConnectToNetworkRequested(
menu_items_[index].service_path);
} else if (flags & FLAG_ADD_WIFI) { } else if (flags & FLAG_ADD_WIFI) {
ShowOther(flimflam::kTypeWifi); ShowOther(flimflam::kTypeWifi);
} else if (flags & FLAG_ADD_CELLULAR) { } else if (flags & FLAG_ADD_CELLULAR) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment