| 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 2087 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2098 rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), | 2098 rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), |
| 2099 GetSystemMetrics(SM_CYSIZEFRAME)); | 2099 GetSystemMetrics(SM_CYSIZEFRAME)); |
| 2100 } | 2100 } |
| 2101 | 2101 |
| 2102 return gfx::win::ScreenToDIPRect(rect); | 2102 return gfx::win::ScreenToDIPRect(rect); |
| 2103 #else | 2103 #else |
| 2104 return window_->GetToplevelWindow()->GetBoundsInScreen(); | 2104 return window_->GetToplevelWindow()->GetBoundsInScreen(); |
| 2105 #endif | 2105 #endif |
| 2106 } | 2106 } |
| 2107 | 2107 |
| 2108 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, | 2108 void RenderWidgetHostViewAura::GestureEventAck( |
| 2109 InputEventAckState ack_result) { | 2109 const blink::WebGestureEvent& event, |
| 2110 InputEventAckState ack_result) { |
| 2110 if (touch_editing_client_) | 2111 if (touch_editing_client_) |
| 2111 touch_editing_client_->GestureEventAck(gesture_event_type); | 2112 touch_editing_client_->GestureEventAck(event.type); |
| 2112 } | 2113 } |
| 2113 | 2114 |
| 2114 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 2115 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( |
| 2115 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 2116 const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { |
| 2116 ScopedVector<ui::TouchEvent> events; | 2117 ScopedVector<ui::TouchEvent> events; |
| 2117 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 2118 if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, |
| 2118 SCREEN_COORDINATES)) | 2119 SCREEN_COORDINATES)) |
| 2119 return; | 2120 return; |
| 2120 | 2121 |
| 2121 aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); | 2122 aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); |
| (...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3520 RenderWidgetHost* widget) { | 3521 RenderWidgetHost* widget) { |
| 3521 return new RenderWidgetHostViewAura(widget); | 3522 return new RenderWidgetHostViewAura(widget); |
| 3522 } | 3523 } |
| 3523 | 3524 |
| 3524 // static | 3525 // static |
| 3525 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3526 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3526 GetScreenInfoForWindow(results, NULL); | 3527 GetScreenInfoForWindow(results, NULL); |
| 3527 } | 3528 } |
| 3528 | 3529 |
| 3529 } // namespace content | 3530 } // namespace content |
| OLD | NEW |