OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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.h" | 5 #include "content/browser/renderer_host/render_widget_host.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
(...skipping 765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
776 void RenderWidgetHost::ImeSetComposition( | 776 void RenderWidgetHost::ImeSetComposition( |
777 const string16& text, | 777 const string16& text, |
778 const std::vector<WebKit::WebCompositionUnderline>& underlines, | 778 const std::vector<WebKit::WebCompositionUnderline>& underlines, |
779 int selection_start, | 779 int selection_start, |
780 int selection_end) { | 780 int selection_end) { |
781 Send(new ViewMsg_ImeSetComposition( | 781 Send(new ViewMsg_ImeSetComposition( |
782 routing_id(), text, underlines, selection_start, selection_end)); | 782 routing_id(), text, underlines, selection_start, selection_end)); |
783 } | 783 } |
784 | 784 |
785 void RenderWidgetHost::ImeConfirmComposition(const string16& text) { | 785 void RenderWidgetHost::ImeConfirmComposition(const string16& text) { |
786 Send(new ViewMsg_ImeConfirmComposition(routing_id(), text)); | 786 ImeConfirmComposition(text, ui::Range::InvalidRange()); |
| 787 } |
| 788 |
| 789 void RenderWidgetHost::ImeConfirmComposition( |
| 790 const string16& text, const ui::Range& replacement_range) { |
| 791 Send(new ViewMsg_ImeConfirmComposition( |
| 792 routing_id(), text, replacement_range)); |
787 } | 793 } |
788 | 794 |
789 void RenderWidgetHost::ImeConfirmComposition() { | 795 void RenderWidgetHost::ImeConfirmComposition() { |
790 Send(new ViewMsg_ImeConfirmComposition(routing_id(), string16())); | 796 ImeConfirmComposition(string16()); |
791 } | 797 } |
792 | 798 |
793 void RenderWidgetHost::ImeCancelComposition() { | 799 void RenderWidgetHost::ImeCancelComposition() { |
794 Send(new ViewMsg_ImeSetComposition(routing_id(), string16(), | 800 Send(new ViewMsg_ImeSetComposition(routing_id(), string16(), |
795 std::vector<WebKit::WebCompositionUnderline>(), 0, 0)); | 801 std::vector<WebKit::WebCompositionUnderline>(), 0, 0)); |
796 } | 802 } |
797 | 803 |
798 bool RenderWidgetHost::CanLockMouse() const { | 804 bool RenderWidgetHost::CanLockMouse() const { |
799 return false; | 805 return false; |
800 } | 806 } |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1369 | 1375 |
1370 void RenderWidgetHost::Delete() { | 1376 void RenderWidgetHost::Delete() { |
1371 Send(new ViewMsg_Delete(routing_id())); | 1377 Send(new ViewMsg_Delete(routing_id())); |
1372 UserMetrics::RecordAction(UserMetricsAction("DeleteSelection")); | 1378 UserMetrics::RecordAction(UserMetricsAction("DeleteSelection")); |
1373 } | 1379 } |
1374 | 1380 |
1375 void RenderWidgetHost::SelectAll() { | 1381 void RenderWidgetHost::SelectAll() { |
1376 Send(new ViewMsg_SelectAll(routing_id())); | 1382 Send(new ViewMsg_SelectAll(routing_id())); |
1377 UserMetrics::RecordAction(UserMetricsAction("SelectAll")); | 1383 UserMetrics::RecordAction(UserMetricsAction("SelectAll")); |
1378 } | 1384 } |
OLD | NEW |