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

Side by Side Diff: content/browser/web_contents/touch_editable_impl_aura.cc

Issue 798683003: Rename old Aura TouchSelectionController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Minor fixes Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/browser/web_contents/touch_editable_impl_aura.h" 5 #include "content/browser/web_contents/touch_editable_impl_aura.h"
6 6
7 #include "content/browser/renderer_host/render_widget_host_impl.h" 7 #include "content/browser/renderer_host/render_widget_host_impl.h"
8 #include "content/browser/renderer_host/render_widget_host_view_aura.h" 8 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
9 #include "content/browser/web_contents/web_contents_impl.h" 9 #include "content/browser/web_contents/web_contents_impl.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 //////////////////////////////////////////////////////////////////////////////// 72 ////////////////////////////////////////////////////////////////////////////////
73 // TouchEditableImplAura, RenderWidgetHostViewAura::TouchEditingClient 73 // TouchEditableImplAura, RenderWidgetHostViewAura::TouchEditingClient
74 // implementation: 74 // implementation:
75 75
76 void TouchEditableImplAura::StartTouchEditing() { 76 void TouchEditableImplAura::StartTouchEditing() {
77 if (!rwhva_ || !rwhva_->HasFocus()) 77 if (!rwhva_ || !rwhva_->HasFocus())
78 return; 78 return;
79 79
80 if (!touch_selection_controller_) { 80 if (!touch_selection_controller_) {
81 touch_selection_controller_.reset( 81 touch_selection_controller_.reset(
82 ui::TouchSelectionController::create(this)); 82 ui::TouchEditingControllerDeprecated::Create(this));
83 } 83 }
84 if (touch_selection_controller_) 84 if (touch_selection_controller_)
85 touch_selection_controller_->SelectionChanged(); 85 touch_selection_controller_->SelectionChanged();
86 } 86 }
87 87
88 void TouchEditableImplAura::EndTouchEditing(bool quick) { 88 void TouchEditableImplAura::EndTouchEditing(bool quick) {
89 if (touch_selection_controller_) { 89 if (touch_selection_controller_) {
90 if (touch_selection_controller_->IsHandleDragInProgress()) { 90 if (touch_selection_controller_->IsHandleDragInProgress()) {
91 touch_selection_controller_->SelectionChanged(); 91 touch_selection_controller_->SelectionChanged();
92 } else { 92 } else {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 rwhva_ = NULL; 371 rwhva_ = NULL;
372 } 372 }
373 text_input_type_ = ui::TEXT_INPUT_TYPE_NONE; 373 text_input_type_ = ui::TEXT_INPUT_TYPE_NONE;
374 EndTouchEditing(true); 374 EndTouchEditing(true);
375 selection_gesture_in_process_ = false; 375 selection_gesture_in_process_ = false;
376 handles_hidden_due_to_scroll_ = false; 376 handles_hidden_due_to_scroll_ = false;
377 scrolls_in_progress_ = 0; 377 scrolls_in_progress_ = 0;
378 } 378 }
379 379
380 } // namespace content 380 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698