Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2580)

Unified Diff: athena/input/input_manager_impl.cc

Issue 322503005: Athena's FocusManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/input/accelerator_manager_unittest.cc ('k') | athena/input/public/accelerator_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/input/input_manager_impl.cc
diff --git a/athena/input/input_manager_impl.cc b/athena/input/input_manager_impl.cc
index 3d1c803783e1f44d1f300d2f98347cde7b250c34..6a74a3896c5176d7d0238da7bd9175c0ff96601b 100644
--- a/athena/input/input_manager_impl.cc
+++ b/athena/input/input_manager_impl.cc
@@ -8,6 +8,7 @@
#include "base/logging.h"
#include "ui/aura/client/event_client.h"
#include "ui/aura/env.h"
+#include "ui/aura/window.h"
#include "ui/events/event_target.h"
namespace athena {
@@ -36,7 +37,7 @@ class InputManagerImpl : public InputManager,
// Overridden from aura::client::EventClient:
virtual bool CanProcessEventsWithinSubtree(
const aura::Window* window) const OVERRIDE {
- return true;
+ return window && !window->ignore_events();
}
virtual ui::EventTarget* GetToplevelEventTarget() OVERRIDE { return this; }
« no previous file with comments | « athena/input/accelerator_manager_unittest.cc ('k') | athena/input/public/accelerator_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698