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

Side by Side Diff: ui/touch_selection/touch_selection_controller_aura.cc

Issue 829913004: WIP: Plumbing through text selection granularity control support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@unified_text_selection_diff
Patch Set: Missing file. Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/touch_selection/touch_selection_controller_aura.h" 5 #include "ui/touch_selection/touch_selection_controller_aura.h"
6 6
7 #include "ui/aura/client/cursor_client.h" 7 #include "ui/aura/client/cursor_client.h"
8 #include "ui/aura/env.h" 8 #include "ui/aura/env.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 #include "ui/events/event.h" 10 #include "ui/events/event.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 201
202 void TouchSelectionControllerAura::SetNeedsAnimate() { 202 void TouchSelectionControllerAura::SetNeedsAnimate() {
203 NOTREACHED(); 203 NOTREACHED();
204 } 204 }
205 205
206 void TouchSelectionControllerAura::MoveCaret(const gfx::PointF& position) { 206 void TouchSelectionControllerAura::MoveCaret(const gfx::PointF& position) {
207 client_->MoveCaret(position); 207 client_->MoveCaret(position);
208 } 208 }
209 209
210 void TouchSelectionControllerAura::MoveRangeSelectionExtent( 210 void TouchSelectionControllerAura::MoveRangeSelectionExtent(
211 const gfx::PointF& extent) { 211 const gfx::PointF& extent,
212 client_->MoveRangeSelectionExtent(extent); 212 ui::TextSelectionGranularity granularity) {
213 client_->MoveRangeSelectionExtent(extent, granularity);
213 } 214 }
214 215
215 void TouchSelectionControllerAura::SelectBetweenCoordinates( 216 void TouchSelectionControllerAura::SelectBetweenCoordinates(
216 const gfx::PointF& base, 217 const gfx::PointF& base,
217 const gfx::PointF& extent) { 218 const gfx::PointF& extent) {
218 client_->SelectBetweenCoordinates(base, extent); 219 client_->SelectBetweenCoordinates(base, extent);
219 } 220 }
220 221
221 void TouchSelectionControllerAura::OnSelectionEvent( 222 void TouchSelectionControllerAura::OnSelectionEvent(
222 SelectionEventType event, 223 SelectionEventType event,
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 void TouchSelectionControllerAura::OnScrollEvent(ScrollEvent* event) { 309 void TouchSelectionControllerAura::OnScrollEvent(ScrollEvent* event) {
309 LOG(ERROR) << "ScrollEvent: " << event->name(); 310 LOG(ERROR) << "ScrollEvent: " << event->name();
310 311
311 DCHECK(controller_->is_insertion_active() || 312 DCHECK(controller_->is_insertion_active() ||
312 controller_->is_selection_active()); 313 controller_->is_selection_active());
313 314
314 HideAndDisallowShowingAutomatically(); 315 HideAndDisallowShowingAutomatically();
315 } 316 }
316 317
317 } // namespace ui 318 } // namespace ui
OLDNEW
« no previous file with comments | « ui/touch_selection/touch_selection_controller_aura.h ('k') | ui/touch_selection/ui_touch_selection.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698