| 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 2904 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2915 event->SetHandled(); | 2915 event->SetHandled(); |
| 2916 } | 2916 } |
| 2917 break; | 2917 break; |
| 2918 case ui::ET_GESTURE_TAP: | 2918 case ui::ET_GESTURE_TAP: |
| 2919 if (selection_controller_->WillHandleTapEvent( | 2919 if (selection_controller_->WillHandleTapEvent( |
| 2920 event->location_f(), event->details().tap_count())) { | 2920 event->location_f(), event->details().tap_count())) { |
| 2921 event->SetHandled(); | 2921 event->SetHandled(); |
| 2922 } | 2922 } |
| 2923 break; | 2923 break; |
| 2924 case ui::ET_GESTURE_SCROLL_BEGIN: | 2924 case ui::ET_GESTURE_SCROLL_BEGIN: |
| 2925 selection_controller_->OnScrollBeginEvent(); |
| 2925 selection_controller_client_->OnScrollStarted(); | 2926 selection_controller_client_->OnScrollStarted(); |
| 2926 break; | 2927 break; |
| 2927 case ui::ET_GESTURE_SCROLL_END: | 2928 case ui::ET_GESTURE_SCROLL_END: |
| 2928 selection_controller_client_->OnScrollCompleted(); | 2929 selection_controller_client_->OnScrollCompleted(); |
| 2929 break; | 2930 break; |
| 2930 default: | 2931 default: |
| 2931 break; | 2932 break; |
| 2932 } | 2933 } |
| 2933 } | 2934 } |
| 2934 | 2935 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3019 | 3020 |
| 3020 //////////////////////////////////////////////////////////////////////////////// | 3021 //////////////////////////////////////////////////////////////////////////////// |
| 3021 // RenderWidgetHostViewBase, public: | 3022 // RenderWidgetHostViewBase, public: |
| 3022 | 3023 |
| 3023 // static | 3024 // static |
| 3024 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 3025 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3025 GetScreenInfoForWindow(results, NULL); | 3026 GetScreenInfoForWindow(results, NULL); |
| 3026 } | 3027 } |
| 3027 | 3028 |
| 3028 } // namespace content | 3029 } // namespace content |
| OLD | NEW |