diff options
| author | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 02:51:45 +0000 |
|---|---|---|
| committer | chocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-09 02:51:45 +0000 |
| commit | ac41b0db3aaf75758f3a917a3d217bf8396c8de3 (patch) | |
| tree | 08ecde9bf04e931dd2797bb7a92b6969ad4ea6d6 | |
| parent | 002752ebe441b5d486f47ef33effe46f0e668adb (diff) | |
| download | chromium_src-ac41b0db3aaf75758f3a917a3d217bf8396c8de3.zip chromium_src-ac41b0db3aaf75758f3a917a3d217bf8396c8de3.tar.gz chromium_src-ac41b0db3aaf75758f3a917a3d217bf8396c8de3.tar.bz2 | |
Merge 65476 - Fix so that we don't show activate 3G in both OOBE and login screen.
BUG=chromium-os:8878
TEST=manual
Review URL: http://codereview.chromium.org/4733001
TBR=chocobo@chromium.org
Review URL: http://codereview.chromium.org/4702003
git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@65480 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/status/network_menu.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 8192e18..3f63ca8 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -550,10 +550,8 @@ void NetworkMenu::InitMenuItems() { chromeos::ActivationState activation_state = cell_networks[i]->activation_state(); if (activation_state == ACTIVATION_STATE_NOT_ACTIVATED) { - // If we are on the login screen, do not show activating 3G option. - // TODO(chocobo): We are currently using ShouldOpenButtonOptions() to - // tell whether or not we are at the login screen. We need to fix it. - if (!ShouldOpenButtonOptions()) + // If we are on the OOBE/login screen, do not show activating 3G option. + if (!IsBrowserMode()) continue; label = l10n_util::GetStringFUTF16( IDS_STATUSBAR_NETWORK_DEVICE_ACTIVATE, |