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

Unified Diff: ui/views/touchui/touch_selection_controller_impl.cc

Issue 1440593004: Make operators on scoped_ptr match the ones defined for std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrequals: followupfix-after-rebase Created 5 years, 1 month 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/views/controls/webview/webview.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/touchui/touch_selection_controller_impl.cc
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index d273ee3fa1913b6b5db4b4623447716d017e4fe1..3a26e613c8a10926ed896a57336e6dd14abd94e8 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -504,7 +504,7 @@ void TouchSelectionControllerImpl::SelectionChanged() {
if (dragging_handle_ != cursor_handle_.get()) {
// The non-dragging-handle might have recently become visible.
EditingHandleView* non_dragging_handle = selection_handle_1_.get();
- if (dragging_handle_ == selection_handle_1_) {
+ if (dragging_handle_ == selection_handle_1_.get()) {
non_dragging_handle = selection_handle_2_.get();
// if handle 1 is being dragged, it is corresponding to the end of
// selection and the other handle to the start of selection.
@@ -567,8 +567,8 @@ void TouchSelectionControllerImpl::SelectionHandleDragged(
// Find the stationary selection handle.
ui::SelectionBound anchor_bound =
- selection_handle_1_ == dragging_handle_ ? selection_bound_2_
- : selection_bound_1_;
+ selection_handle_1_.get() == dragging_handle_ ? selection_bound_2_
+ : selection_bound_1_;
// Find selection end points in client_view's coordinate system.
gfx::Point p2 = anchor_bound.edge_top_rounded();
« no previous file with comments | « ui/views/controls/webview/webview.cc ('k') | ui/views/view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698