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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 16512003: Configure networks requiring a certificate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update error strings Created 7 years, 6 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/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 722d0077041d786d87367a6e15727b7e03fbf190..f3bafb15fa035cf401165a949cc7a92e81dedd28 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -742,31 +742,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
}
virtual void ConfigureNetwork(const std::string& network_id) OVERRIDE {
- const chromeos::NetworkState* network = network_id.empty() ? NULL :
- NetworkHandler::Get()->network_state_handler()->GetNetworkState(
- network_id);
- if (!network) {
- LOG(ERROR) << "ConfigureNetwork: Network not found: " << network_id;
- return;
- }
- if (network->type() == flimflam::kTypeWifi ||
- network->type() == flimflam::kTypeWimax ||
- network->type() == flimflam::kTypeVPN) {
- // TODO(stevenjb): Replace with non-NetworkLibrary UI.
- Network* cros_network = CrosLibrary::Get()->GetNetworkLibrary()->
- FindNetworkByPath(network_id);
- NetworkConfigView::Show(cros_network, GetNativeWindow());
- return;
- }
- if (network->type() == flimflam::kTypeCellular) {
- if (network->activation_state() != flimflam::kActivationStateActivated)
- network_connect::ActivateCellular(network_id);
- else if (network->cellular_out_of_credits())
- network_connect::ShowMobileSetup(network_id);
- return;
- }
- // No special configure or setup for |network_id|, show the settings UI.
- ShowNetworkSettings(network_id);
+ network_connect::HandleUnconfiguredNetwork(network_id, GetNativeWindow());
}
virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl_unittest.cc ('k') | chromeos/network/network_connection_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698