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 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
874 } | 874 } |
875 } | 875 } |
876 | 876 |
877 void RenderWidgetHostViewAura::OnTextInputStateChanged( | 877 void RenderWidgetHostViewAura::OnTextInputStateChanged( |
878 const ViewHostMsg_TextInputState_Params& params) { | 878 const ViewHostMsg_TextInputState_Params& params) { |
879 text_input_flags_ = params.flags; | 879 text_input_flags_ = params.flags; |
880 if (params.show_ime_if_needed && params.type != ui::TEXT_INPUT_TYPE_NONE) { | 880 if (params.show_ime_if_needed && params.type != ui::TEXT_INPUT_TYPE_NONE) { |
881 if (GetInputMethod()) | 881 if (GetInputMethod()) |
882 GetInputMethod()->ShowImeIfNeeded(); | 882 GetInputMethod()->ShowImeIfNeeded(); |
883 } | 883 } |
| 884 if (!GetInputMethod()->SupportsOnScreenKeyboard()) |
| 885 OnKeyboardBoundsUnchanged(); |
884 } | 886 } |
885 | 887 |
886 void RenderWidgetHostViewAura::ImeCancelComposition() { | 888 void RenderWidgetHostViewAura::ImeCancelComposition() { |
887 if (GetInputMethod()) | 889 if (GetInputMethod()) |
888 GetInputMethod()->CancelComposition(this); | 890 GetInputMethod()->CancelComposition(this); |
889 has_composition_text_ = false; | 891 has_composition_text_ = false; |
890 } | 892 } |
891 | 893 |
892 void RenderWidgetHostViewAura::ImeCompositionRangeChanged( | 894 void RenderWidgetHostViewAura::ImeCompositionRangeChanged( |
893 const gfx::Range& range, | 895 const gfx::Range& range, |
(...skipping 777 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1671 host_->CandidateWindowHidden(); | 1673 host_->CandidateWindowHidden(); |
1672 } | 1674 } |
1673 | 1675 |
1674 bool RenderWidgetHostViewAura::IsEditingCommandEnabled(int command_id) { | 1676 bool RenderWidgetHostViewAura::IsEditingCommandEnabled(int command_id) { |
1675 return false; | 1677 return false; |
1676 } | 1678 } |
1677 | 1679 |
1678 void RenderWidgetHostViewAura::ExecuteEditingCommand(int command_id) { | 1680 void RenderWidgetHostViewAura::ExecuteEditingCommand(int command_id) { |
1679 } | 1681 } |
1680 | 1682 |
| 1683 void RenderWidgetHostViewAura::OnKeyboardBoundsUnchanged() { |
| 1684 host_->Send(new ViewMsg_FocusChangeComplete(host_->GetRoutingID())); |
| 1685 } |
| 1686 |
1681 //////////////////////////////////////////////////////////////////////////////// | 1687 //////////////////////////////////////////////////////////////////////////////// |
1682 // RenderWidgetHostViewAura, gfx::DisplayObserver implementation: | 1688 // RenderWidgetHostViewAura, gfx::DisplayObserver implementation: |
1683 | 1689 |
1684 void RenderWidgetHostViewAura::OnDisplayAdded( | 1690 void RenderWidgetHostViewAura::OnDisplayAdded( |
1685 const gfx::Display& new_display) { | 1691 const gfx::Display& new_display) { |
1686 } | 1692 } |
1687 | 1693 |
1688 void RenderWidgetHostViewAura::OnDisplayRemoved( | 1694 void RenderWidgetHostViewAura::OnDisplayRemoved( |
1689 const gfx::Display& old_display) { | 1695 const gfx::Display& old_display) { |
1690 } | 1696 } |
(...skipping 959 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2650 | 2656 |
2651 //////////////////////////////////////////////////////////////////////////////// | 2657 //////////////////////////////////////////////////////////////////////////////// |
2652 // RenderWidgetHostViewBase, public: | 2658 // RenderWidgetHostViewBase, public: |
2653 | 2659 |
2654 // static | 2660 // static |
2655 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2661 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2656 GetScreenInfoForWindow(results, NULL); | 2662 GetScreenInfoForWindow(results, NULL); |
2657 } | 2663 } |
2658 | 2664 |
2659 } // namespace content | 2665 } // namespace content |
OLD | NEW |