| OLD | NEW |
| 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 #include "content/browser/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 2757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2768 selection_controller_->OnSelectionEmpty(is_empty_text_form_control); | 2768 selection_controller_->OnSelectionEmpty(is_empty_text_form_control); |
| 2769 selection_controller_->OnSelectionBoundsChanged(start, end); | 2769 selection_controller_->OnSelectionBoundsChanged(start, end); |
| 2770 } | 2770 } |
| 2771 | 2771 |
| 2772 void RenderWidgetHostViewAura::CreateSelectionController() { | 2772 void RenderWidgetHostViewAura::CreateSelectionController() { |
| 2773 ui::TouchSelectionController::Config tsc_config; | 2773 ui::TouchSelectionController::Config tsc_config; |
| 2774 tsc_config.max_tap_duration = base::TimeDelta::FromMilliseconds( | 2774 tsc_config.max_tap_duration = base::TimeDelta::FromMilliseconds( |
| 2775 ui::GestureConfiguration::GetInstance()->long_press_time_in_ms()); | 2775 ui::GestureConfiguration::GetInstance()->long_press_time_in_ms()); |
| 2776 tsc_config.tap_slop = ui::GestureConfiguration::GetInstance() | 2776 tsc_config.tap_slop = ui::GestureConfiguration::GetInstance() |
| 2777 ->max_touch_move_in_pixels_for_click(); | 2777 ->max_touch_move_in_pixels_for_click(); |
| 2778 tsc_config.show_on_tap_for_empty_editable = false; | |
| 2779 tsc_config.enable_longpress_drag_selection = false; | 2778 tsc_config.enable_longpress_drag_selection = false; |
| 2780 selection_controller_.reset(new ui::TouchSelectionController( | 2779 selection_controller_.reset(new ui::TouchSelectionController( |
| 2781 selection_controller_client_.get(), tsc_config)); | 2780 selection_controller_client_.get(), tsc_config)); |
| 2782 } | 2781 } |
| 2783 | 2782 |
| 2784 void RenderWidgetHostViewAura::HandleGestureForTouchSelection( | 2783 void RenderWidgetHostViewAura::HandleGestureForTouchSelection( |
| 2785 ui::GestureEvent* event) { | 2784 ui::GestureEvent* event) { |
| 2786 switch (event->type()) { | 2785 switch (event->type()) { |
| 2787 case ui::ET_GESTURE_LONG_PRESS: | 2786 case ui::ET_GESTURE_LONG_PRESS: |
| 2788 if (selection_controller_->WillHandleLongPressEvent( | 2787 if (selection_controller_->WillHandleLongPressEvent( |
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3066 | 3065 |
| 3067 //////////////////////////////////////////////////////////////////////////////// | 3066 //////////////////////////////////////////////////////////////////////////////// |
| 3068 // RenderWidgetHostViewBase, public: | 3067 // RenderWidgetHostViewBase, public: |
| 3069 | 3068 |
| 3070 // static | 3069 // static |
| 3071 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3070 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3072 GetScreenInfoForWindow(results, NULL); | 3071 GetScreenInfoForWindow(results, NULL); |
| 3073 } | 3072 } |
| 3074 | 3073 |
| 3075 } // namespace content | 3074 } // namespace content |
| OLD | NEW |