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

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

Issue 14753003: Don't open mobile setup when activating Sprint network from network menu (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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/status/network_menu.cc
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc
index 7fc33fb1870d94aaf96f82f05ccd6fdacde1d409..f2f7b04c94d0a3cc9cb0abff24b4b5ef408aa2db 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -64,11 +64,15 @@ std::string EscapeAmpersands(const std::string& input) {
}
// Activate a cellular network.
-void ActivateCellular(const chromeos::CellularNetwork* cellular) {
+void ActivateCellular(chromeos::CellularNetwork* cellular) {
DCHECK(cellular);
- ash::Shell::GetInstance()->delegate()->OpenMobileSetup(
- cellular->service_path());
+ if (cellular->UsesDirectActivation()) {
+ cellular->StartActivation();
+ } else {
+ ash::Shell::GetInstance()->delegate()->OpenMobileSetup(
+ cellular->service_path());
+ }
}
// Decides whether a network should be highlighted in the UI.

Powered by Google App Engine
This is Rietveld 408576698