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

Side by Side Diff: ui/views/controls/textfield/textfield.h

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
« no previous file with comments | « ui/base/touch/touch_editing_controller.cc ('k') | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 5 #ifndef UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
6 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 6 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
447 // A timer and point used to modify the selection when dragging. 447 // A timer and point used to modify the selection when dragging.
448 base::RepeatingTimer<Textfield> drag_selection_timer_; 448 base::RepeatingTimer<Textfield> drag_selection_timer_;
449 gfx::Point last_drag_location_; 449 gfx::Point last_drag_location_;
450 450
451 // State variables used to track double and triple clicks. 451 // State variables used to track double and triple clicks.
452 size_t aggregated_clicks_; 452 size_t aggregated_clicks_;
453 base::TimeDelta last_click_time_; 453 base::TimeDelta last_click_time_;
454 gfx::Point last_click_location_; 454 gfx::Point last_click_location_;
455 gfx::Range double_click_word_; 455 gfx::Range double_click_word_;
456 456
457 scoped_ptr<ui::TouchSelectionController> touch_selection_controller_; 457 scoped_ptr<ui::TouchEditingControllerDeprecated> touch_selection_controller_;
458 458
459 // Used to track touch drag starting location and offset to enable touch 459 // Used to track touch drag starting location and offset to enable touch
460 // scrolling. 460 // scrolling.
461 gfx::Point drag_start_location_; 461 gfx::Point drag_start_location_;
462 int drag_start_display_offset_; 462 int drag_start_display_offset_;
463 463
464 // Tracks if touch editing handles are hidden because user has started 464 // Tracks if touch editing handles are hidden because user has started
465 // scrolling. If |true|, handles are shown after scrolling ends. 465 // scrolling. If |true|, handles are shown after scrolling ends.
466 bool touch_handles_hidden_due_to_scroll_; 466 bool touch_handles_hidden_due_to_scroll_;
467 467
468 // Context menu related members. 468 // Context menu related members.
469 scoped_ptr<ui::SimpleMenuModel> context_menu_contents_; 469 scoped_ptr<ui::SimpleMenuModel> context_menu_contents_;
470 scoped_ptr<views::MenuRunner> context_menu_runner_; 470 scoped_ptr<views::MenuRunner> context_menu_runner_;
471 471
472 // Used to bind callback functions to this object. 472 // Used to bind callback functions to this object.
473 base::WeakPtrFactory<Textfield> weak_ptr_factory_; 473 base::WeakPtrFactory<Textfield> weak_ptr_factory_;
474 474
475 DISALLOW_COPY_AND_ASSIGN(Textfield); 475 DISALLOW_COPY_AND_ASSIGN(Textfield);
476 }; 476 };
477 477
478 } // namespace views 478 } // namespace views
479 479
480 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_ 480 #endif // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
OLDNEW
« no previous file with comments | « ui/base/touch/touch_editing_controller.cc ('k') | ui/views/controls/textfield/textfield.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698