| 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_android.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_android.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "content/browser/android/content_view_core_impl.h" | 10 #include "content/browser/android/content_view_core_impl.h" |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, true); | 289 return gfx::GLSurfaceHandle(gfx::kNullPluginWindow, true); |
| 290 } | 290 } |
| 291 | 291 |
| 292 void RenderWidgetHostViewAndroid::GetScreenInfo(WebKit::WebScreenInfo* result) { | 292 void RenderWidgetHostViewAndroid::GetScreenInfo(WebKit::WebScreenInfo* result) { |
| 293 // ScreenInfo isn't tied to the widget on Android. Always return the default. | 293 // ScreenInfo isn't tied to the widget on Android. Always return the default. |
| 294 RenderWidgetHostViewBase::GetDefaultScreenInfo(result); | 294 RenderWidgetHostViewBase::GetDefaultScreenInfo(result); |
| 295 } | 295 } |
| 296 | 296 |
| 297 // TODO(jrg): Find out the implications and answer correctly here, | 297 // TODO(jrg): Find out the implications and answer correctly here, |
| 298 // as we are returning the WebView and not root window bounds. | 298 // as we are returning the WebView and not root window bounds. |
| 299 gfx::Rect RenderWidgetHostViewAndroid::GetRootWindowBounds() { | 299 gfx::Rect RenderWidgetHostViewAndroid::GetBoundsInRootWindow() { |
| 300 return GetViewBounds(); | 300 return GetViewBounds(); |
| 301 } | 301 } |
| 302 | 302 |
| 303 void RenderWidgetHostViewAndroid::UnhandledWheelEvent( | 303 void RenderWidgetHostViewAndroid::UnhandledWheelEvent( |
| 304 const WebKit::WebMouseWheelEvent& event) { | 304 const WebKit::WebMouseWheelEvent& event) { |
| 305 // intentionally empty, like RenderWidgetHostViewViews | 305 // intentionally empty, like RenderWidgetHostViewViews |
| 306 } | 306 } |
| 307 | 307 |
| 308 void RenderWidgetHostViewAndroid::ProcessTouchAck( | 308 void RenderWidgetHostViewAndroid::ProcessTouchAck( |
| 309 WebKit::WebInputEvent::Type type, bool processed) { | 309 WebKit::WebInputEvent::Type type, bool processed) { |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 // RenderWidgetHostView, public: | 359 // RenderWidgetHostView, public: |
| 360 | 360 |
| 361 // static | 361 // static |
| 362 RenderWidgetHostView* | 362 RenderWidgetHostView* |
| 363 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { | 363 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) { |
| 364 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); | 364 RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget); |
| 365 return new RenderWidgetHostViewAndroid(rwhi, NULL); | 365 return new RenderWidgetHostViewAndroid(rwhi, NULL); |
| 366 } | 366 } |
| 367 | 367 |
| 368 } // namespace content | 368 } // namespace content |
| OLD | NEW |