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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 1694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1705 // but it is not necessary here because the final target view is responsible | 1705 // but it is not necessary here because the final target view is responsible |
1706 // for converting before computing the final transform. | 1706 // for converting before computing the final transform. |
1707 return delegated_frame_host_->TransformPointToCoordSpaceForView( | 1707 return delegated_frame_host_->TransformPointToCoordSpaceForView( |
1708 point, target_view, transformed_point); | 1708 point, target_view, transformed_point); |
1709 } | 1709 } |
1710 | 1710 |
1711 void RenderWidgetHostViewAura::FocusedNodeChanged( | 1711 void RenderWidgetHostViewAura::FocusedNodeChanged( |
1712 bool editable, | 1712 bool editable, |
1713 const gfx::Rect& node_bounds_in_screen) { | 1713 const gfx::Rect& node_bounds_in_screen) { |
1714 #if defined(OS_WIN) | 1714 #if defined(OS_WIN) |
1715 if (!editable && virtual_keyboard_requested_) { | 1715 if (!editable && virtual_keyboard_requested_ && |
| 1716 !node_bounds_in_screen.IsEmpty()) { |
1716 virtual_keyboard_requested_ = false; | 1717 virtual_keyboard_requested_ = false; |
1717 | 1718 |
1718 RenderViewHost* rvh = RenderViewHost::From(host_); | 1719 RenderViewHost* rvh = RenderViewHost::From(host_); |
1719 if (rvh && rvh->GetDelegate()) | 1720 if (rvh && rvh->GetDelegate()) |
1720 rvh->GetDelegate()->SetIsVirtualKeyboardRequested(false); | 1721 rvh->GetDelegate()->SetIsVirtualKeyboardRequested(false); |
1721 | 1722 |
1722 DCHECK(ui::OnScreenKeyboardDisplayManager::GetInstance()); | 1723 DCHECK(ui::OnScreenKeyboardDisplayManager::GetInstance()); |
1723 ui::OnScreenKeyboardDisplayManager::GetInstance()->DismissVirtualKeyboard(); | 1724 ui::OnScreenKeyboardDisplayManager::GetInstance()->DismissVirtualKeyboard(); |
1724 } | 1725 } |
1725 #endif | 1726 #endif |
(...skipping 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2429 | 2430 |
2430 void RenderWidgetHostViewAura::ScrollFocusedEditableNodeIntoRect( | 2431 void RenderWidgetHostViewAura::ScrollFocusedEditableNodeIntoRect( |
2431 const gfx::Rect& node_rect) { | 2432 const gfx::Rect& node_rect) { |
2432 RenderFrameHostImpl* rfh = GetFocusedFrame(); | 2433 RenderFrameHostImpl* rfh = GetFocusedFrame(); |
2433 if (rfh) { | 2434 if (rfh) { |
2434 rfh->GetFrameInputHandler()->ScrollFocusedEditableNodeIntoRect(node_rect); | 2435 rfh->GetFrameInputHandler()->ScrollFocusedEditableNodeIntoRect(node_rect); |
2435 } | 2436 } |
2436 } | 2437 } |
2437 | 2438 |
2438 } // namespace content | 2439 } // namespace content |
OLD | NEW |