diff options
| author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 22:25:26 +0000 |
|---|---|---|
| committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 22:25:26 +0000 |
| commit | f03abb555b2265168cc61cc0ca567e1e46d5ea12 (patch) | |
| tree | 80c97617548c7db8c44a486966561279f14e8dbb /chrome/browser/chromeos | |
| parent | 45a5c7cad23ce17adf6fa5cf89ddb58038d01b95 (diff) | |
| download | chromium_src-f03abb555b2265168cc61cc0ca567e1e46d5ea12.zip chromium_src-f03abb555b2265168cc61cc0ca567e1e46d5ea12.tar.gz chromium_src-f03abb555b2265168cc61cc0ca567e1e46d5ea12.tar.bz2 | |
Moving over to other folder button while opening folder menu should open the folder menu.
It was failing with DCHECK instead.
This CL fix this issue by Canceling menu only when the menu has x grab.
I also separated grk grab broke and X grab broke because gtk broke require releasing x grab for this case.
BUG=chromium-os:13151
TEST=see bug description.
Review URL: http://codereview.chromium.org/6676032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/login/screen_locker.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index 56e9977..9c0530e 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -361,14 +361,13 @@ class GrabWidget : public views::WidgetGtk { void TryUngrabOtherClients(); private: - virtual void HandleGrabBroke() { + virtual void HandleGtkGrabBroke() { // Input should never be stolen from ScreenLocker once it's // grabbed. If this happens, it's a bug and has to be fixed. We // 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 || - mouse_grab_status_ != GDK_GRAB_SUCCESS) - << "Grab Broke. quitting"; + CHECK_NE(GDK_GRAB_SUCCESS, kbd_grab_status_); + CHECK_NE(GDK_GRAB_SUCCESS, mouse_grab_status_); } chromeos::ScreenLocker* screen_locker_; |