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

Unified Diff: chrome/browser/chromeos/options/network_connect.cc

Issue 22340006: Show notifications for Network Config errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + move comment Created 7 years, 4 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 | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/options/network_connect.cc
diff --git a/chrome/browser/chromeos/options/network_connect.cc b/chrome/browser/chromeos/options/network_connect.cc
index 54dd043418c83347d56da2ccbfa93cfb929408d4..a49432572e61dc86ed42431ed71e051cbf57113a 100644
--- a/chrome/browser/chromeos/options/network_connect.cc
+++ b/chrome/browser/chromeos/options/network_connect.cc
@@ -104,8 +104,14 @@ void HandleUnconfiguredNetwork(const std::string& service_path,
return;
}
- if (network->type() == flimflam::kTypeWifi ||
- network->type() == flimflam::kTypeWimax ||
+ if (network->type() == flimflam::kTypeWifi) {
+ // Only show the config view for secure networks, otherwise do nothing.
+ if (network->security() != flimflam::kSecurityNone)
+ NetworkConfigView::Show(service_path, parent_window);
+ return;
+ }
+
+ if (network->type() == flimflam::kTypeWimax ||
network->type() == flimflam::kTypeVPN) {
NetworkConfigView::Show(service_path, parent_window);
return;
« no previous file with comments | « chrome/browser/chromeos/cros/network_library.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698