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

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

Issue 10837056: Disable showing 3g activation in OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 9dbd28cdbdbf26c2da95722d4383f09994c29bdd..6a82b514f5431d3d2c48ade58fdc32479d4dba14 100644
--- a/chrome/browser/chromeos/status/network_menu.cc
+++ b/chrome/browser/chromeos/status/network_menu.cc
@@ -588,6 +588,11 @@ void MainMenuModel::InitMenuItems(bool should_open_button_options) {
chromeos::ActivationState activation_state =
cell_networks[i]->activation_state();
+ // This is currently only used in the OOBE screen, do not show
+ // activating 3G option.
+ if (activation_state != ACTIVATION_STATE_ACTIVATED)
+ continue;
+
// Ampersand is a valid character in a network name, but menu2 uses it
// to mark "mnemonics" for keyboard shortcuts. http://crosbug.com/14697
std::string network_name = EscapeAmpersands(cell_networks[i]->name());
« 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