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

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

Issue 15937008: Unify ActivateCellular into network_connect.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 6d4c8e04c05177592fc40148ba1aaaf8379fe80e..ec46124f49265aceae18a3de9403bdb15809d9e7 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -763,10 +763,11 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
NetworkConfigView::Show(cros_network, GetNativeWindow());
return;
}
- if (network->type() == flimflam::kTypeCellular &&
- (network->activation_state() != flimflam::kActivationStateActivated ||
- network->cellular_out_of_credits())) {
- ash::Shell::GetInstance()->delegate()->OpenMobileSetup(network_id);
+ 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.

Powered by Google App Engine
This is Rietveld 408576698