diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 23:26:54 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-09 23:26:54 +0000 |
| commit | c878bb13ef0175d11e7d57a739fa28d6367220e6 (patch) | |
| tree | 5af4e3b39c8355874e35818bdb0f6b6d465065c7 /chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm | |
| parent | c1c8ce33f81f41de6a03ae614a695b628d0a95aa (diff) | |
| download | chromium_src-c878bb13ef0175d11e7d57a739fa28d6367220e6.zip chromium_src-c878bb13ef0175d11e7d57a739fa28d6367220e6.tar.gz chromium_src-c878bb13ef0175d11e7d57a739fa28d6367220e6.tar.bz2 | |
Merge 143189 - Mouse events pass through Mac Fullscreen Exit Bubble for Mouse Lock.
Merge approved in roll-up issue crbug.com/134196#c9.
BUG=132183
TEST=Manual test as described in bug.
Review URL: https://chromiumcodereview.appspot.com/10584005
TBR=scheib@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10752015
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@145783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm index c5908f8..88ebc6d 100644 --- a/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/fullscreen_exit_bubble_controller.mm @@ -76,6 +76,11 @@ const float kHideDuration = 0.7; owner_ = owner; url_ = url; bubbleType_ = bubbleType; + // Mouse lock expects mouse events to reach the main window immediately. + // Make the bubble transparent for mouse events if mouse lock is enabled. + if (bubbleType_ == FEB_TYPE_FULLSCREEN_MOUSELOCK_EXIT_INSTRUCTION || + bubbleType_ == FEB_TYPE_MOUSELOCK_EXIT_INSTRUCTION) + [[self window] setIgnoresMouseEvents:YES]; } return self; } |