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

Unified Diff: ui/chromeos/touch_exploration_controller.cc

Issue 1557683002: Convert Pass()→std::move() in //ui (CrOS edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: ui/chromeos/touch_exploration_controller.cc
diff --git a/ui/chromeos/touch_exploration_controller.cc b/ui/chromeos/touch_exploration_controller.cc
index 9350ce62295c2d09d86be9203d69b5ce4ad07ef0..5294629f84ad741a124a7a196d7bc3cec0485d83 100644
--- a/ui/chromeos/touch_exploration_controller.cc
+++ b/ui/chromeos/touch_exploration_controller.cc
@@ -4,6 +4,8 @@
#include "ui/chromeos/touch_exploration_controller.h"
+#include <utility>
+
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/default_tick_clock.h"
@@ -378,7 +380,7 @@ ui::EventRewriteStatus TouchExplorationController::InDoubleTapPending(
new_event->set_location_f(last_touch_exploration_->location_f());
new_event->set_root_location_f(last_touch_exploration_->location_f());
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
SET_STATE(NO_FINGERS_DOWN);
return ui::EVENT_REWRITE_REWRITTEN;
}
@@ -402,7 +404,7 @@ ui::EventRewriteStatus TouchExplorationController::InTouchReleasePending(
new_event->set_location_f(last_touch_exploration_->location_f());
new_event->set_root_location_f(last_touch_exploration_->location_f());
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
SET_STATE(NO_FINGERS_DOWN);
return ui::EVENT_REWRITE_REWRITTEN;
}
@@ -424,7 +426,7 @@ ui::EventRewriteStatus TouchExplorationController::InTouchExploration(
new_event->set_location_f(last_touch_exploration_->location_f());
new_event->set_root_location_f(last_touch_exploration_->location_f());
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
SET_STATE(TOUCH_EXPLORE_SECOND_PRESS);
return ui::EVENT_REWRITE_REWRITTEN;
} else if (type == ui::ET_TOUCH_RELEASED || type == ui::ET_TOUCH_CANCELLED) {
@@ -481,7 +483,7 @@ ui::EventRewriteStatus TouchExplorationController::InCornerPassthrough(
new_event->set_location_f(event.location_f());
new_event->set_root_location_f(event.location_f());
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
if (current_touch_ids_.size() == 0)
SET_STATE(NO_FINGERS_DOWN);
@@ -503,7 +505,7 @@ ui::EventRewriteStatus TouchExplorationController::InOneFingerPassthrough(
new_event->set_location_f(event.location_f() - passthrough_offset_);
new_event->set_root_location_f(event.location_f() - passthrough_offset_);
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
if (current_touch_ids_.size() == 0) {
SET_STATE(NO_FINGERS_DOWN);
}
@@ -526,7 +528,7 @@ ui::EventRewriteStatus TouchExplorationController::InTouchExploreSecondPress(
new_event->set_location_f(last_touch_exploration_->location_f());
new_event->set_root_location_f(last_touch_exploration_->location_f());
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
SET_STATE(WAIT_FOR_NO_FINGERS);
return ui::EVENT_REWRITE_REWRITTEN;
} else if (type == ui::ET_TOUCH_MOVED) {
@@ -555,7 +557,7 @@ ui::EventRewriteStatus TouchExplorationController::InTouchExploreSecondPress(
new_event->set_location_f(last_touch_exploration_->location_f());
new_event->set_root_location_f(last_touch_exploration_->location_f());
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
SET_STATE(WAIT_FOR_NO_FINGERS);
return ui::EVENT_REWRITE_REWRITTEN;
}
@@ -581,7 +583,7 @@ ui::EventRewriteStatus TouchExplorationController::InTouchExploreSecondPress(
new_event->set_location_f(last_touch_exploration_->location_f());
new_event->set_root_location_f(last_touch_exploration_->location_f());
new_event->set_flags(event.flags());
- *rewritten_event = new_event.Pass();
+ *rewritten_event = std::move(new_event);
SET_STATE(TOUCH_EXPLORATION);
EnterTouchToMouseMode();
return ui::EVENT_REWRITE_REWRITTEN;
« no previous file with comments | « ui/base/ime/chromeos/input_method_whitelist.cc ('k') | ui/display/chromeos/apply_content_protection_task_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698