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 1028 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1039 | 1039 |
1040 if (frame->software_frame_data) { | 1040 if (frame->software_frame_data) { |
1041 DLOG(ERROR) << "Unable to use software frame in aura"; | 1041 DLOG(ERROR) << "Unable to use software frame in aura"; |
1042 RecordAction( | 1042 RecordAction( |
1043 base::UserMetricsAction("BadMessageTerminate_SharedMemoryAura")); | 1043 base::UserMetricsAction("BadMessageTerminate_SharedMemoryAura")); |
1044 host_->GetProcess()->ReceivedBadMessage(); | 1044 host_->GetProcess()->ReceivedBadMessage(); |
1045 return; | 1045 return; |
1046 } | 1046 } |
1047 } | 1047 } |
1048 | 1048 |
| 1049 void RenderWidgetHostViewAura::DidStopFlinging() { |
| 1050 if (touch_editing_client_) |
| 1051 touch_editing_client_->DidStopFlinging(); |
| 1052 } |
| 1053 |
1049 #if defined(OS_WIN) | 1054 #if defined(OS_WIN) |
1050 void RenderWidgetHostViewAura::SetParentNativeViewAccessible( | 1055 void RenderWidgetHostViewAura::SetParentNativeViewAccessible( |
1051 gfx::NativeViewAccessible accessible_parent) { | 1056 gfx::NativeViewAccessible accessible_parent) { |
1052 } | 1057 } |
1053 | 1058 |
1054 gfx::NativeViewId RenderWidgetHostViewAura::GetParentForWindowlessPlugin() | 1059 gfx::NativeViewId RenderWidgetHostViewAura::GetParentForWindowlessPlugin() |
1055 const { | 1060 const { |
1056 if (legacy_render_widget_host_HWND_) { | 1061 if (legacy_render_widget_host_HWND_) { |
1057 return reinterpret_cast<gfx::NativeViewId>( | 1062 return reinterpret_cast<gfx::NativeViewId>( |
1058 legacy_render_widget_host_HWND_->hwnd()); | 1063 legacy_render_widget_host_HWND_->hwnd()); |
(...skipping 1435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2494 | 2499 |
2495 //////////////////////////////////////////////////////////////////////////////// | 2500 //////////////////////////////////////////////////////////////////////////////// |
2496 // RenderWidgetHostViewBase, public: | 2501 // RenderWidgetHostViewBase, public: |
2497 | 2502 |
2498 // static | 2503 // static |
2499 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2504 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2500 GetScreenInfoForWindow(results, NULL); | 2505 GetScreenInfoForWindow(results, NULL); |
2501 } | 2506 } |
2502 | 2507 |
2503 } // namespace content | 2508 } // namespace content |
OLD | NEW |