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

Unified Diff: ui/aura/root_window.h

Issue 11314013: Register a separate default ui::EventTarget for Aura (Ash) to ensure that it does not interfere wit… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | « ash/shell.cc ('k') | ui/aura/root_window.cc » ('j') | ui/aura/root_window.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.h
===================================================================
--- ui/aura/root_window.h (revision 163961)
+++ ui/aura/root_window.h (working copy)
@@ -283,6 +283,10 @@
// Exposes RootWindowHost::QueryMouseLocation() for test purposes.
gfx::Point QueryMouseLocationForTest() const;
+ void set_parent_event_target(ui::EventTarget* parent_event_target) {
+ parent_event_target_ = parent_event_target;
+ }
+
private:
friend class Window;
friend class CompositorLock;
@@ -413,6 +417,10 @@
CompositorLock* compositor_lock_;
bool draw_on_compositor_unlock_;
+ // Set to parent EventTarget if any. If this is set to NULL, we default to
+ // EventTarget implemented by the Aura Environment.
+ ui::EventTarget* parent_event_target_;
+
DISALLOW_COPY_AND_ASSIGN(RootWindow);
};
« no previous file with comments | « ash/shell.cc ('k') | ui/aura/root_window.cc » ('j') | ui/aura/root_window.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698