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_impl.h" | 5 #include "content/browser/renderer_host/render_widget_host_impl.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 | 8 |
9 #include <set> | 9 #include <set> |
10 #include <tuple> | 10 #include <tuple> |
(...skipping 1615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1626 const base::string16& text, | 1626 const base::string16& text, |
1627 const std::vector<blink::WebCompositionUnderline>& underlines, | 1627 const std::vector<blink::WebCompositionUnderline>& underlines, |
1628 const gfx::Range& replacement_range, | 1628 const gfx::Range& replacement_range, |
1629 int selection_start, | 1629 int selection_start, |
1630 int selection_end) { | 1630 int selection_end) { |
1631 Send(new InputMsg_ImeSetComposition( | 1631 Send(new InputMsg_ImeSetComposition( |
1632 GetRoutingID(), text, underlines, replacement_range, | 1632 GetRoutingID(), text, underlines, replacement_range, |
1633 selection_start, selection_end)); | 1633 selection_start, selection_end)); |
1634 } | 1634 } |
1635 | 1635 |
1636 void RenderWidgetHostImpl::ImeCommitText(const base::string16& text, | 1636 void RenderWidgetHostImpl::ImeCommitText( |
1637 const gfx::Range& replacement_range, | 1637 const base::string16& text, |
1638 int relative_cursor_pos) { | 1638 const std::vector<blink::WebCompositionUnderline>& underlines, |
1639 Send(new InputMsg_ImeCommitText(GetRoutingID(), text, replacement_range, | 1639 const gfx::Range& replacement_range, |
1640 relative_cursor_pos)); | 1640 int relative_cursor_pos) { |
| 1641 Send(new InputMsg_ImeCommitText(GetRoutingID(), text, underlines, |
| 1642 replacement_range, relative_cursor_pos)); |
1641 } | 1643 } |
1642 | 1644 |
1643 void RenderWidgetHostImpl::ImeFinishComposingText(bool keep_selection) { | 1645 void RenderWidgetHostImpl::ImeFinishComposingText(bool keep_selection) { |
1644 Send(new InputMsg_ImeFinishComposingText(GetRoutingID(), keep_selection)); | 1646 Send(new InputMsg_ImeFinishComposingText(GetRoutingID(), keep_selection)); |
1645 } | 1647 } |
1646 | 1648 |
1647 void RenderWidgetHostImpl::ImeCancelComposition() { | 1649 void RenderWidgetHostImpl::ImeCancelComposition() { |
1648 Send(new InputMsg_ImeSetComposition(GetRoutingID(), base::string16(), | 1650 Send(new InputMsg_ImeSetComposition(GetRoutingID(), base::string16(), |
1649 std::vector<blink::WebCompositionUnderline>(), | 1651 std::vector<blink::WebCompositionUnderline>(), |
1650 gfx::Range::InvalidRange(), 0, 0)); | 1652 gfx::Range::InvalidRange(), 0, 0)); |
(...skipping 863 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2514 // different from the receiver's. | 2516 // different from the receiver's. |
2515 file_system_file.url = | 2517 file_system_file.url = |
2516 GURL(storage::GetIsolatedFileSystemRootURIString( | 2518 GURL(storage::GetIsolatedFileSystemRootURIString( |
2517 file_system_url.origin(), filesystem_id, std::string()) | 2519 file_system_url.origin(), filesystem_id, std::string()) |
2518 .append(register_name)); | 2520 .append(register_name)); |
2519 file_system_file.filesystem_id = filesystem_id; | 2521 file_system_file.filesystem_id = filesystem_id; |
2520 } | 2522 } |
2521 } | 2523 } |
2522 | 2524 |
2523 } // namespace content | 2525 } // namespace content |
OLD | NEW |