diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 04:44:14 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-21 04:44:14 +0000 |
| commit | 997ec9fba33d3dabd0f8dff77008f8c18b1c0e77 (patch) | |
| tree | 212fc4b375b7c8ae9cc301dcdf16534649893e61 /ui/aura/root_window.cc | |
| parent | 50d19e7175c1f43a6b3ebb9f82c81364746c2f00 (diff) | |
| download | chromium_src-997ec9fba33d3dabd0f8dff77008f8c18b1c0e77.zip chromium_src-997ec9fba33d3dabd0f8dff77008f8c18b1c0e77.tar.gz chromium_src-997ec9fba33d3dabd0f8dff77008f8c18b1c0e77.tar.bz2 | |
[base] Move AutoReset to base namespace.
NOTRY=true
R=darin@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/11308132
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.cc')
| -rw-r--r-- | ui/aura/root_window.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/aura/root_window.cc b/ui/aura/root_window.cc index d734807..1531710 100644 --- a/ui/aura/root_window.cc +++ b/ui/aura/root_window.cc @@ -625,19 +625,19 @@ void RootWindow::HandleMouseMoved(const ui::MouseEvent& event, Window* target) { } bool RootWindow::ProcessMouseEvent(Window* target, ui::MouseEvent* event) { - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return ProcessEvent(target, event) != ui::ER_UNHANDLED; } bool RootWindow::ProcessKeyEvent(Window* target, ui::KeyEvent* event) { if (!target) target = this; - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return ProcessEvent(target, event) != ui::ER_UNHANDLED; } bool RootWindow::ProcessScrollEvent(Window* target, ui::ScrollEvent* event) { - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return ProcessEvent(target, event) != ui::ER_UNHANDLED; } @@ -645,7 +645,7 @@ ui::EventResult RootWindow::ProcessTouchEvent(Window* target, ui::TouchEvent* event) { if (!target) target = this; - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return static_cast<ui::EventResult>(ProcessEvent(target, event)); } @@ -653,7 +653,7 @@ ui::EventResult RootWindow::ProcessGestureEvent(Window* target, ui::GestureEvent* event) { if (!target) target = this; - AutoReset<Window*> reset(&event_dispatch_target_, target); + base::AutoReset<Window*> reset(&event_dispatch_target_, target); return static_cast<ui::EventResult>(ProcessEvent(target, event)); } @@ -971,7 +971,7 @@ bool RootWindow::DispatchMouseEventToTarget(ui::MouseEvent* event, ui::EF_LEFT_MOUSE_BUTTON | ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON; - AutoReset<Window*> reset(&mouse_event_dispatch_target_, target); + base::AutoReset<Window*> reset(&mouse_event_dispatch_target_, target); SetLastMouseLocation(this, event->location()); synthesize_mouse_move_ = false; switch (event->type()) { |