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

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

Issue 23514028: Update screen is skipped even if user clicks on Ethernet. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e4ebe740322e003c0900ea4a2956e32f5f342c5b..46c4ecb9e2f2dee9ab2de87160fd692c7516520c 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -214,7 +214,6 @@ void NetworkMenuModel::ConnectToNetworkAt(int index) {
const std::string& service_path = menu_items_[index].service_path;
gfx::NativeWindow native_window = owner_->delegate()->GetNativeWindow();
ash::network_connect::ConnectToNetwork(service_path, native_window);
- owner_->delegate()->OnConnectToNetworkRequested(service_path);
}
////////////////////////////////////////////////////////////////////////////////
@@ -310,9 +309,12 @@ void NetworkMenuModel::ActivatedAt(int index) {
} else if (flags & FLAG_TOGGLE_MOBILE) {
ToggleTechnology(NetworkStateHandler::kMatchTypeMobile);
} 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)) {
ConnectToNetworkAt(index);
+ owner_->delegate()->OnConnectToNetworkRequested(
+ menu_items_[index].service_path);
} else if (flags & FLAG_ADD_WIFI) {
ShowOther(flimflam::kTypeWifi);
} else if (flags & FLAG_ADD_CELLULAR) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698