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 <android/bitmap.h> | 7 #include <android/bitmap.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
736 | 736 |
737 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { | 737 float RenderWidgetHostViewAndroid::GetBottomControlsHeight() const { |
738 if (!content_view_core_) | 738 if (!content_view_core_) |
739 return 0.f; | 739 return 0.f; |
740 | 740 |
741 // The height of the browser controls. | 741 // The height of the browser controls. |
742 return content_view_core_->GetBottomControlsHeightDip(); | 742 return content_view_core_->GetBottomControlsHeightDip(); |
743 } | 743 } |
744 | 744 |
745 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { | 745 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) { |
746 // There are no cursors on Android. | 746 CursorInfo cursor_info; |
| 747 cursor.GetCursorInfo(&cursor_info); |
| 748 view_.OnCursorChanged(cursor_info.type, cursor_info.custom_image, |
| 749 cursor_info.hotspot); |
747 } | 750 } |
748 | 751 |
749 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { | 752 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) { |
750 // Do nothing. The UI notification is handled through ContentViewClient which | 753 // Do nothing. The UI notification is handled through ContentViewClient which |
751 // is TabContentsDelegate. | 754 // is TabContentsDelegate. |
752 } | 755 } |
753 | 756 |
754 // ----------------------------------------------------------------------------- | 757 // ----------------------------------------------------------------------------- |
755 // TextInputManager::Observer implementations. | 758 // TextInputManager::Observer implementations. |
756 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( | 759 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled( |
(...skipping 1666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2423 } | 2426 } |
2424 | 2427 |
2425 void RenderWidgetHostViewAndroid::SetOverscrollControllerForTesting( | 2428 void RenderWidgetHostViewAndroid::SetOverscrollControllerForTesting( |
2426 ui::OverscrollRefreshHandler* overscroll_refresh_handler) { | 2429 ui::OverscrollRefreshHandler* overscroll_refresh_handler) { |
2427 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( | 2430 overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>( |
2428 overscroll_refresh_handler, view_.GetWindowAndroid()->GetCompositor(), | 2431 overscroll_refresh_handler, view_.GetWindowAndroid()->GetCompositor(), |
2429 view_.GetDipScale()); | 2432 view_.GetDipScale()); |
2430 } | 2433 } |
2431 | 2434 |
2432 } // namespace content | 2435 } // namespace content |
OLD | NEW |