| 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 2133 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2144     rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), | 2144     rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), | 
| 2145                GetSystemMetrics(SM_CYSIZEFRAME)); | 2145                GetSystemMetrics(SM_CYSIZEFRAME)); | 
| 2146   } | 2146   } | 
| 2147 | 2147 | 
| 2148   return gfx::win::ScreenToDIPRect(rect); | 2148   return gfx::win::ScreenToDIPRect(rect); | 
| 2149 #else | 2149 #else | 
| 2150   return window_->GetToplevelWindow()->GetBoundsInScreen(); | 2150   return window_->GetToplevelWindow()->GetBoundsInScreen(); | 
| 2151 #endif | 2151 #endif | 
| 2152 } | 2152 } | 
| 2153 | 2153 | 
| 2154 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, | 2154 void RenderWidgetHostViewAura::GestureEventAck( | 
| 2155                                                InputEventAckState ack_result) { | 2155     const blink::WebGestureEvent& event, | 
|  | 2156     InputEventAckState ack_result) { | 
| 2156   if (touch_editing_client_) | 2157   if (touch_editing_client_) | 
| 2157     touch_editing_client_->GestureEventAck(gesture_event_type); | 2158     touch_editing_client_->GestureEventAck(event.type); | 
| 2158 } | 2159 } | 
| 2159 | 2160 | 
| 2160 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 2161 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 
| 2161     const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 2162     const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 
| 2162   ScopedVector<ui::TouchEvent> events; | 2163   ScopedVector<ui::TouchEvent> events; | 
| 2163   if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 2164   if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 
| 2164                                            SCREEN_COORDINATES)) | 2165                                            SCREEN_COORDINATES)) | 
| 2165     return; | 2166     return; | 
| 2166 | 2167 | 
| 2167   aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); | 2168   aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); | 
| (...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3566     RenderWidgetHost* widget) { | 3567     RenderWidgetHost* widget) { | 
| 3567   return new RenderWidgetHostViewAura(widget); | 3568   return new RenderWidgetHostViewAura(widget); | 
| 3568 } | 3569 } | 
| 3569 | 3570 | 
| 3570 // static | 3571 // static | 
| 3571 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3572 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 
| 3572   GetScreenInfoForWindow(results, NULL); | 3573   GetScreenInfoForWindow(results, NULL); | 
| 3573 } | 3574 } | 
| 3574 | 3575 | 
| 3575 }  // namespace content | 3576 }  // namespace content | 
| OLD | NEW | 
|---|