summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 18:21:18 +0000
committerchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-10 18:21:18 +0000
commitede729d4d7a1e6a1dc07d58e0fff2ca5cc6e7131 (patch)
treea2135910aa0aeb225851fab27b4dd13bfd10da77 /chrome/browser
parent4d40a3fea9835707ba96733100365de86871c076 (diff)
downloadchromium_src-ede729d4d7a1e6a1dc07d58e0fff2ca5cc6e7131.zip
chromium_src-ede729d4d7a1e6a1dc07d58e0fff2ca5cc6e7131.tar.gz
chromium_src-ede729d4d7a1e6a1dc07d58e0fff2ca5cc6e7131.tar.bz2
Do not show network settings menu option for login.
BUG=1683 TEST=none Review URL: http://codereview.chromium.org/793001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/chromeos/login/wizard_controller.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index f0f1696..e744a82 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -15,6 +15,7 @@
#include "chrome/browser/chromeos/login/rounded_rect_painter.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/status/clock_menu_button.h"
+#include "chrome/browser/chromeos/status/network_menu_button.h"
#include "chrome/browser/chromeos/status/status_area_view.h"
#include "unicode/locid.h"
#include "views/view.h"
@@ -255,9 +256,10 @@ gfx::NativeWindow WizardController::GetNativeWindow() const {
bool WizardController::ShouldOpenButtonOptions(
const views::View* button_view) const {
- if (button_view == contents_->status_area()->clock_view()) {
+ if (button_view == contents_->status_area()->clock_view())
+ return false;
+ if (button_view == contents_->status_area()->network_view())
return false;
- }
return true;
}