diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:12:25 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-23 15:12:25 +0000 |
| commit | 6f7a474bf2a783f6690d91bb3d89a8d7db319f5a (patch) | |
| tree | e51c29245003317720ccb1e5107c1249458ef7c0 /chrome | |
| parent | d9f9219691294710fface354ad0c99b32adf2300 (diff) | |
| download | chromium_src-6f7a474bf2a783f6690d91bb3d89a8d7db319f5a.zip chromium_src-6f7a474bf2a783f6690d91bb3d89a8d7db319f5a.tar.gz chromium_src-6f7a474bf2a783f6690d91bb3d89a8d7db319f5a.tar.bz2 | |
Don't propagage event on message bubble to parent.
MesssageBubble was propagating event to the parent,
which caused problem in screen locker. This change is
harmless in login screen.
Fix a cut&paste error in CHECK in grab broke handler.
BUG=chromium-os:4213
TEST=see bug for intstruction to reproduce the crash. This should fix the crash.
Review URL: http://codereview.chromium.org/2811022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50595 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/login/message_bubble.h | 7 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/screen_locker.cc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h index 9bc4464..d265ac1 100644 --- a/chrome/browser/chromeos/login/message_bubble.h +++ b/chrome/browser/chromeos/login/message_bubble.h @@ -45,8 +45,13 @@ class MessageBubble : public InfoBubble, // Overridden from WidgetGtk. virtual void Close(); - protected: + virtual gboolean OnButtonPress(GtkWidget* widget, GdkEventButton* event) { + WidgetGtk::OnButtonPress(widget, event); + // Never propagate event to parent. + return true; + } + protected: // views::ButtonListener implmenets. virtual void ButtonPressed(views::Button* sender, const views::Event& event); diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index a767154..e97758f 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -234,7 +234,7 @@ class GrabWidget : public views::WidgetGtk { // let chrome crash to get a crash report and dump, and // SessionManager will terminate the session to logout. CHECK(kbd_grab_status_ != GDK_GRAB_SUCCESS || - kbd_grab_status_ != GDK_GRAB_SUCCESS) + mouse_grab_status_ != GDK_GRAB_SUCCESS) << "Grab Broke. quitting"; } |