summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 14:33:14 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-17 14:33:14 +0000
commit31c76a85ab6ae02d67d5a1d6317e89d47ea9d061 (patch)
tree0c055c7cc1bc0319b50a6620b6d115def2f467ea
parentcc1b14657d607bb9bdab70bdbce048c0ea94c7fd (diff)
downloadchromium_src-31c76a85ab6ae02d67d5a1d6317e89d47ea9d061.zip
chromium_src-31c76a85ab6ae02d67d5a1d6317e89d47ea9d061.tar.gz
chromium_src-31c76a85ab6ae02d67d5a1d6317e89d47ea9d061.tar.bz2
Remove error bubble on typing new password
BUG=chromium-os:10958 TEST=manual Review URL: http://codereview.chromium.org/6355007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71594 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/existing_user_view.cc2
-rw-r--r--chrome/browser/chromeos/login/new_user_view.cc2
-rw-r--r--chrome/browser/chromeos/login/wizard_controller.cc8
3 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/login/existing_user_view.cc b/chrome/browser/chromeos/login/existing_user_view.cc
index 26bb6ba..ab7e3bf 100644
--- a/chrome/browser/chromeos/login/existing_user_view.cc
+++ b/chrome/browser/chromeos/login/existing_user_view.cc
@@ -116,6 +116,8 @@ bool ExistingUserView::HandleKeyEvent(views::Textfield* sender,
void ExistingUserView::ContentsChanged(views::Textfield* sender,
const string16& new_contents) {
+ if (!new_contents.empty())
+ user_controller_->ClearErrors();
}
void ExistingUserView::EnableInputControls(bool enabled) {
diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc
index 69fd79f..f458a86 100644
--- a/chrome/browser/chromeos/login/new_user_view.cc
+++ b/chrome/browser/chromeos/login/new_user_view.cc
@@ -544,6 +544,8 @@ bool NewUserView::HandleKeyEvent(views::Textfield* sender,
void NewUserView::ContentsChanged(views::Textfield* sender,
const string16& new_contents) {
UpdateSignInButtonState();
+ if (!new_contents.empty())
+ delegate_->ClearErrors();
}
void NewUserView::EnableInputControls(bool enabled) {
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index d1c2702..853b311 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -305,10 +305,12 @@ void WizardController::Init(const std::string& first_screen_name,
}
void WizardController::Show() {
- // In tests we might startup without initial screen
- // so widget_ hasn't been created yet.
- if (first_screen_name_ != kTestNoScreenName)
+ // In tests and in case of --login-screen=login there is no screen to show.
+ if (first_screen_name_ != kTestNoScreenName &&
+ first_screen_name_ != kLoginScreenName) {
DCHECK(widget_);
+ }
+
if (widget_)
widget_->Show();
}