| 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 2097 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 2108     rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), | 2108     rect.Inset(GetSystemMetrics(SM_CXSIZEFRAME), | 
| 2109                GetSystemMetrics(SM_CYSIZEFRAME)); | 2109                GetSystemMetrics(SM_CYSIZEFRAME)); | 
| 2110   } | 2110   } | 
| 2111 | 2111 | 
| 2112   return gfx::win::ScreenToDIPRect(rect); | 2112   return gfx::win::ScreenToDIPRect(rect); | 
| 2113 #else | 2113 #else | 
| 2114   return window_->GetToplevelWindow()->GetBoundsInScreen(); | 2114   return window_->GetToplevelWindow()->GetBoundsInScreen(); | 
| 2115 #endif | 2115 #endif | 
| 2116 } | 2116 } | 
| 2117 | 2117 | 
| 2118 void RenderWidgetHostViewAura::GestureEventAck(int gesture_event_type, | 2118 void RenderWidgetHostViewAura::GestureEventAck( | 
| 2119                                                InputEventAckState ack_result) { | 2119     const blink::WebGestureEvent& event, | 
|  | 2120     InputEventAckState ack_result) { | 
| 2120   if (touch_editing_client_) | 2121   if (touch_editing_client_) | 
| 2121     touch_editing_client_->GestureEventAck(gesture_event_type); | 2122     touch_editing_client_->GestureEventAck(event.type); | 
| 2122 } | 2123 } | 
| 2123 | 2124 | 
| 2124 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 2125 void RenderWidgetHostViewAura::ProcessAckedTouchEvent( | 
| 2125     const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 2126     const TouchEventWithLatencyInfo& touch, InputEventAckState ack_result) { | 
| 2126   ScopedVector<ui::TouchEvent> events; | 2127   ScopedVector<ui::TouchEvent> events; | 
| 2127   if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 2128   if (!MakeUITouchEventsFromWebTouchEvents(touch, &events, | 
| 2128                                            SCREEN_COORDINATES)) | 2129                                            SCREEN_COORDINATES)) | 
| 2129     return; | 2130     return; | 
| 2130 | 2131 | 
| 2131   aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); | 2132   aura::WindowEventDispatcher* dispatcher = window_->GetDispatcher(); | 
| (...skipping 1398 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3530     RenderWidgetHost* widget) { | 3531     RenderWidgetHost* widget) { | 
| 3531   return new RenderWidgetHostViewAura(widget); | 3532   return new RenderWidgetHostViewAura(widget); | 
| 3532 } | 3533 } | 
| 3533 | 3534 | 
| 3534 // static | 3535 // static | 
| 3535 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3536 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 
| 3536   GetScreenInfoForWindow(results, NULL); | 3537   GetScreenInfoForWindow(results, NULL); | 
| 3537 } | 3538 } | 
| 3538 | 3539 | 
| 3539 }  // namespace content | 3540 }  // namespace content | 
| OLD | NEW | 
|---|