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 "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 2125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2136 rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), | 2136 rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), |
2137 GetSystemMetrics(SM_CYSIZEFRAME)); | 2137 GetSystemMetrics(SM_CYSIZEFRAME)); |
2138 } | 2138 } |
2139 | 2139 |
2140 return gfx::win::ScreenToDIPRect(rect); | 2140 return gfx::win::ScreenToDIPRect(rect); |
2141 #else | 2141 #else |
2142 return window_->GetToplevelWindow()->GetBoundsInScreen(); | 2142 return window_->GetToplevelWindow()->GetBoundsInScreen(); |
2143 #endif | 2143 #endif |
2144 } | 2144 } |
2145 | 2145 |
2146 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, | 2146 void RenderWidgetHostViewAura::GestureEventAck( |
2147 InputEventAckState ack_result) { | 2147 const blink::WebGestureEvent& event, |
| 2148 InputEventAckState ack_result) { |
2148 if (touch_editing_client_) | 2149 if (touch_editing_client_) |
2149 touch_editing_client_->GestureEventAck(gesture_event_type); | 2150 touch_editing_client_->GestureEventAck(event.type); |
2150 } | 2151 } |
2151 | 2152 |
2152 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 2153 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
2153 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 2154 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { |
2154 ScopedVector<ui::TouchEvent> events; | 2155 ScopedVector<ui::TouchEvent> events; |
2155 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 2156 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, |
2156 SCREEN_COORDINATES)) | 2157 SCREEN_COORDINATES)) |
2157 return; | 2158 return; |
2158 | 2159 |
2159 aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); | 2160 aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); |
(...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3558 RenderWidgetHost* widget) { | 3559 RenderWidgetHost* widget) { |
3559 return new RenderWidgetHostViewAura(widget); | 3560 return new RenderWidgetHostViewAura(widget); |
3560 } | 3561 } |
3561 | 3562 |
3562 // static | 3563 // static |
3563 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3564 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
3564 GetScreenInfoForWindow(results, NULL); | 3565 GetScreenInfoForWindow(results, NULL); |
3565 } | 3566 } |
3566 | 3567 |
3567 } // namespace content | 3568 } // namespace content |
OLD | NEW |