diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 21:29:00 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-19 21:29:00 +0000 |
| commit | 8340eda5f5a5c725de29419739fbdef59d3cfcc4 (patch) | |
| tree | 78d69454566a54b9ab95d19b19f711d2db70f02c /ui/aura/window_event_dispatcher.cc | |
| parent | 00c51dc84d6b1cc306ca188b20f350280109890a (diff) | |
| download | chromium_src-8340eda5f5a5c725de29419739fbdef59d3cfcc4.zip chromium_src-8340eda5f5a5c725de29419739fbdef59d3cfcc4.tar.gz chromium_src-8340eda5f5a5c725de29419739fbdef59d3cfcc4.tar.bz2 | |
Revert 258077 "Remove PrepareForShutdown"
Broke Linux official builder:
http://build.chromium.org/p/chromium/builders/Linux/builds/48352/steps/compile/logs/stdio
../../apps/shell/browser/shell_browser_main_parts.cc:197:42:error: 'class aura::WindowEventDispatcher' has no member named 'PrepareForShutdown'
ninja: build stopped: subcommand failed.
> Remove PrepareForShutdown
> Filter events after shutdown in event filter instead.
>
> BUG=None
>
> Review URL: https://codereview.chromium.org/196573023
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/205313002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258103 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/window_event_dispatcher.cc')
| -rw-r--r-- | ui/aura/window_event_dispatcher.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/aura/window_event_dispatcher.cc b/ui/aura/window_event_dispatcher.cc index 82d1ef6..22471b4 100644 --- a/ui/aura/window_event_dispatcher.cc +++ b/ui/aura/window_event_dispatcher.cc @@ -92,6 +92,12 @@ WindowEventDispatcher::~WindowEventDispatcher() { ui::GestureRecognizer::Get()->RemoveGestureEventHelper(this); } +void WindowEventDispatcher::PrepareForShutdown() { + host_->PrepareForShutdown(); + // discard synthesize event request as well. + synthesize_mouse_move_ = false; +} + void WindowEventDispatcher::RepostEvent(const ui::LocatedEvent& event) { DCHECK(event.type() == ui::ET_MOUSE_PRESSED || event.type() == ui::ET_GESTURE_TAP_DOWN); |