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

Unified Diff: ui/aura/window_event_dispatcher.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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/window_event_dispatcher.h ('k') | ui/aura/window_event_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_event_dispatcher.cc
diff --git a/ui/aura/window_event_dispatcher.cc b/ui/aura/window_event_dispatcher.cc
index 39dc1a489378812bad41fa551e3c957acef1ccf9..d34ad330b94132a61b11b0bb623da676b972620a 100644
--- a/ui/aura/window_event_dispatcher.cc
+++ b/ui/aura/window_event_dispatcher.cc
@@ -171,7 +171,7 @@ DispatchDetails WindowEventDispatcher::DispatchMouseExitAtPoint(
void WindowEventDispatcher::ProcessedTouchEvent(uint32_t unique_event_id,
Window* window,
ui::EventResult result) {
- scoped_ptr<ui::GestureRecognizer::Gestures> gestures(
+ std::unique_ptr<ui::GestureRecognizer::Gestures> gestures(
ui::GestureRecognizer::Get()->AckTouchEvent(unique_event_id, result,
window));
DispatchDetails details = ProcessGestures(window, gestures.get());
@@ -505,7 +505,7 @@ ui::EventDispatchDetails WindowEventDispatcher::PostDispatchEvent(
const ui::TouchEvent& touchevent = *event.AsTouchEvent();
if (!touchevent.synchronous_handling_disabled()) {
- scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
+ std::unique_ptr<ui::GestureRecognizer::Gestures> gestures;
Window* window = static_cast<Window*>(target);
gestures.reset(ui::GestureRecognizer::Get()->AckTouchEvent(
@@ -668,7 +668,8 @@ ui::EventDispatchDetails WindowEventDispatcher::DispatchHeldEvents() {
if (held_repostable_event_) {
if (held_repostable_event_->type() == ui::ET_MOUSE_PRESSED ||
held_repostable_event_->type() == ui::ET_TOUCH_PRESSED) {
- scoped_ptr<ui::LocatedEvent> event = std::move(held_repostable_event_);
+ std::unique_ptr<ui::LocatedEvent> event =
+ std::move(held_repostable_event_);
dispatching_held_event_ = event.get();
dispatch_details = OnEventFromSource(event.get());
} else {
« no previous file with comments | « ui/aura/window_event_dispatcher.h ('k') | ui/aura/window_event_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698