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/browser_plugin/browser_plugin_guest.h" | 5 #include "content/browser/browser_plugin/browser_plugin_guest.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 | 10 |
(...skipping 888 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
899 const std::string& text, | 899 const std::string& text, |
900 const std::vector<blink::WebCompositionUnderline>& underlines, | 900 const std::vector<blink::WebCompositionUnderline>& underlines, |
901 int selection_start, | 901 int selection_start, |
902 int selection_end) { | 902 int selection_end) { |
903 Send(new InputMsg_ImeSetComposition(routing_id(), | 903 Send(new InputMsg_ImeSetComposition(routing_id(), |
904 base::UTF8ToUTF16(text), underlines, | 904 base::UTF8ToUTF16(text), underlines, |
905 gfx::Range::InvalidRange(), | 905 gfx::Range::InvalidRange(), |
906 selection_start, selection_end)); | 906 selection_start, selection_end)); |
907 } | 907 } |
908 | 908 |
909 void BrowserPluginGuest::OnImeCommitText(int browser_plugin_instance_id, | 909 void BrowserPluginGuest::OnImeCommitText( |
910 const std::string& text, | 910 int browser_plugin_instance_id, |
911 int relative_cursor_pos) { | 911 const std::string& text, |
| 912 const std::vector<blink::WebCompositionUnderline>& underlines, |
| 913 int relative_cursor_pos) { |
912 Send(new InputMsg_ImeCommitText(routing_id(), base::UTF8ToUTF16(text), | 914 Send(new InputMsg_ImeCommitText(routing_id(), base::UTF8ToUTF16(text), |
913 gfx::Range::InvalidRange(), | 915 underlines, gfx::Range::InvalidRange(), |
914 relative_cursor_pos)); | 916 relative_cursor_pos)); |
915 } | 917 } |
916 | 918 |
917 void BrowserPluginGuest::OnImeFinishComposingText(bool keep_selection) { | 919 void BrowserPluginGuest::OnImeFinishComposingText(bool keep_selection) { |
918 Send(new InputMsg_ImeFinishComposingText(routing_id(), keep_selection)); | 920 Send(new InputMsg_ImeFinishComposingText(routing_id(), keep_selection)); |
919 } | 921 } |
920 | 922 |
921 void BrowserPluginGuest::OnExtendSelectionAndDelete( | 923 void BrowserPluginGuest::OnExtendSelectionAndDelete( |
922 int browser_plugin_instance_id, | 924 int browser_plugin_instance_id, |
923 int before, | 925 int before, |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1063 range, character_bounds); | 1065 range, character_bounds); |
1064 } | 1066 } |
1065 #endif | 1067 #endif |
1066 | 1068 |
1067 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) { | 1069 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) { |
1068 if (delegate_) | 1070 if (delegate_) |
1069 delegate_->SetContextMenuPosition(position); | 1071 delegate_->SetContextMenuPosition(position); |
1070 } | 1072 } |
1071 | 1073 |
1072 } // namespace content | 1074 } // namespace content |
OLD | NEW |