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

Unified Diff: ui/aura/scoped_window_targeter.cc

Issue 423503002: Make ScopedWindowTargeter add itself as a WindowObserver for real (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | « no previous file | ui/aura/window_targeter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/scoped_window_targeter.cc
diff --git a/ui/aura/scoped_window_targeter.cc b/ui/aura/scoped_window_targeter.cc
index 96355246245a856c91340faba0edee0b7e11a572..d71e9193df9bf39f8cb6f08ad1b26e5ba3ca9eb2 100644
--- a/ui/aura/scoped_window_targeter.cc
+++ b/ui/aura/scoped_window_targeter.cc
@@ -13,11 +13,14 @@ ScopedWindowTargeter::ScopedWindowTargeter(
scoped_ptr<ui::EventTargeter> new_targeter)
: window_(window),
old_targeter_(window->SetEventTargeter(new_targeter.Pass())) {
+ window_->AddObserver(this);
}
ScopedWindowTargeter::~ScopedWindowTargeter() {
- if (window_)
+ if (window_) {
+ window_->RemoveObserver(this);
window_->SetEventTargeter(old_targeter_.Pass());
+ }
}
void ScopedWindowTargeter::OnWindowDestroyed(Window* window) {
« no previous file with comments | « no previous file | ui/aura/window_targeter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698