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

Unified Diff: ui/aura/root_window.cc

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 | « ui/aura/root_window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
===================================================================
--- ui/aura/root_window.cc (revision 163961)
+++ ui/aura/root_window.cc (working copy)
@@ -145,7 +145,8 @@
mouse_move_hold_count_(0),
ALLOW_THIS_IN_INITIALIZER_LIST(held_mouse_event_factory_(this)),
compositor_lock_(NULL),
- draw_on_compositor_unlock_(false) {
+ draw_on_compositor_unlock_(false),
+ parent_event_target_(NULL) {
SetName("RootWindow");
compositor_.reset(new ui::Compositor(this, host_->GetAcceleratedWidget()));
@@ -485,6 +486,8 @@
// RootWindow, ui::EventTarget implementation:
ui::EventTarget* RootWindow::GetParentTarget() {
+ if (parent_event_target_)
Ben Goodger (Google) 2012/10/26 21:51:57 instead of doing this can we add a method to ui/au
ananta 2012/10/26 22:28:41 Done.
+ return parent_event_target_;
return Env::GetInstance();
}
« no previous file with comments | « ui/aura/root_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698