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

Unified Diff: ui/aura/root_window.cc

Issue 9159048: Fix compile with Aura/Mac ash_shell and workspace controller (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes reverse iterators for compatibility with 10.5 SDK Created 8 years, 11 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/wm/workspace_controller.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.cc
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc
index 2d66c34e052d381ecc72f19a06cd5ef34f2a9650..19bce7a6e74b8b7af5febe7e13f5a57f010a42ba 100644
--- a/ui/aura/root_window.cc
+++ b/ui/aura/root_window.cc
@@ -482,8 +482,9 @@ bool RootWindow::ProcessMouseEvent(Window* target, MouseEvent* event) {
EventFilters filters;
GetEventFiltersToNotify(target->parent(), &filters);
- for (EventFilters::const_reverse_iterator it = filters.rbegin();
- it != filters.rend(); ++it) {
+ for (EventFilters::const_reverse_iterator it = filters.rbegin(),
+ rend = filters.rend();
+ it != rend; ++it) {
if ((*it)->PreHandleMouseEvent(target, event))
return true;
}
@@ -505,8 +506,9 @@ bool RootWindow::ProcessKeyEvent(Window* target, KeyEvent* event) {
GetEventFiltersToNotify(target->parent(), &filters);
}
- for (EventFilters::const_reverse_iterator it = filters.rbegin();
- it != filters.rend(); ++it) {
+ for (EventFilters::const_reverse_iterator it = filters.rbegin(),
+ rend = filters.rend();
+ it != rend; ++it) {
if ((*it)->PreHandleKeyEvent(target, event))
return true;
}
@@ -523,8 +525,9 @@ ui::TouchStatus RootWindow::ProcessTouchEvent(Window* target,
EventFilters filters;
GetEventFiltersToNotify(target->parent(), &filters);
- for (EventFilters::const_reverse_iterator it = filters.rbegin();
- it != filters.rend(); ++it) {
+ for (EventFilters::const_reverse_iterator it = filters.rbegin(),
+ rend = filters.rend();
+ it != rend; ++it) {
ui::TouchStatus status = (*it)->PreHandleTouchEvent(target, event);
if (status != ui::TOUCH_STATUS_UNKNOWN)
return status;
@@ -541,8 +544,9 @@ ui::GestureStatus RootWindow::ProcessGestureEvent(Window* target,
EventFilters filters;
GetEventFiltersToNotify(target->parent(), &filters);
ui::GestureStatus status = ui::GESTURE_STATUS_UNKNOWN;
- for (EventFilters::const_reverse_iterator it = filters.rbegin();
- it != filters.rend(); ++it) {
+ for (EventFilters::const_reverse_iterator it = filters.rbegin(),
+ rend = filters.rend();
+ it != rend; ++it) {
status = (*it)->PreHandleGestureEvent(target, event);
if (status != ui::GESTURE_STATUS_UNKNOWN)
return status;
« no previous file with comments | « ash/wm/workspace_controller.cc ('k') | ui/aura/window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698