summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 02:47:36 +0000
committeroshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-29 02:47:36 +0000
commit99f8e0d06b19334c93fd15b9e74feedc8971fa37 (patch)
tree496cc90be2e6ffebccea535a7a9401930f63238d
parent70728fcca800dc70a6cbef77ccd7cc7b3d025a73 (diff)
downloadchromium_src-99f8e0d06b19334c93fd15b9e74feedc8971fa37.zip
chromium_src-99f8e0d06b19334c93fd15b9e74feedc8971fa37.tar.gz
chromium_src-99f8e0d06b19334c93fd15b9e74feedc8971fa37.tar.bz2
Do not handle mouse event in lock window nor propagage to child.
BUG=none TEST=lock screen and click menu at right corner. Review URL: http://codereview.chromium.org/6893108 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83482 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/screen_locker.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc
index b4d34f2..c52e03e 100644
--- a/chrome/browser/chromeos/login/screen_locker.cc
+++ b/chrome/browser/chromeos/login/screen_locker.cc
@@ -209,6 +209,13 @@ class LockWindow : public views::WidgetGtk {
return false;
}
+ virtual gboolean OnButtonPress(GtkWidget* widget,
+ GdkEventButton* event) OVERRIDE {
+ // Don't handle mouse event in the lock wnidow and
+ // nor propagate to child.
+ return true;
+ }
+
virtual void OnDestroy(GtkWidget* object) OVERRIDE {
VLOG(1) << "OnDestroy: LockWindow destroyed";
views::WidgetGtk::OnDestroy(object);
@@ -863,9 +870,6 @@ void ScreenLocker::OnCaptchaEntered(const std::string& captcha) {
}
void ScreenLocker::Authenticate(const string16& password) {
- if (password.empty())
- return;
-
authentication_start_time_ = base::Time::Now();
screen_lock_view_->SetEnabled(false);
screen_lock_view_->SetSignoutEnabled(false);