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

Unified Diff: ui/wm/core/compound_event_filter.cc

Issue 1152983004: Move ObserverList to base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/compositor/layer_animator.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/compound_event_filter.cc
diff --git a/ui/wm/core/compound_event_filter.cc b/ui/wm/core/compound_event_filter.cc
index ee301f6ab875b03d66e6c4c7cad0a719cc01db2f..8861061114240be149de91d0aff3b3abf01636c3 100644
--- a/ui/wm/core/compound_event_filter.cc
+++ b/ui/wm/core/compound_event_filter.cc
@@ -129,7 +129,7 @@ void CompoundEventFilter::UpdateCursor(aura::Window* target,
void CompoundEventFilter::FilterKeyEvent(ui::KeyEvent* event) {
if (handlers_.might_have_observers()) {
- ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
+ base::ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
ui::EventHandler* handler;
while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
handler->OnKeyEvent(event);
@@ -138,7 +138,7 @@ void CompoundEventFilter::FilterKeyEvent(ui::KeyEvent* event) {
void CompoundEventFilter::FilterMouseEvent(ui::MouseEvent* event) {
if (handlers_.might_have_observers()) {
- ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
+ base::ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
ui::EventHandler* handler;
while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
handler->OnMouseEvent(event);
@@ -147,7 +147,7 @@ void CompoundEventFilter::FilterMouseEvent(ui::MouseEvent* event) {
void CompoundEventFilter::FilterTouchEvent(ui::TouchEvent* event) {
if (handlers_.might_have_observers()) {
- ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
+ base::ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
ui::EventHandler* handler;
while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
handler->OnTouchEvent(event);
@@ -239,7 +239,7 @@ void CompoundEventFilter::OnTouchEvent(ui::TouchEvent* event) {
void CompoundEventFilter::OnGestureEvent(ui::GestureEvent* event) {
if (handlers_.might_have_observers()) {
- ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
+ base::ObserverListBase<ui::EventHandler>::Iterator it(&handlers_);
ui::EventHandler* handler;
while (!event->stopped_propagation() && (handler = it.GetNext()) != NULL)
handler->OnGestureEvent(event);
« no previous file with comments | « ui/compositor/layer_animator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698