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