summaryrefslogtreecommitdiffstats
path: root/content/renderer/render_widget.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-03 20:11:26 +0000
commitfcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch)
treed41b14e6526a822b66d692f60dc8f648a2afb3cd /content/renderer/render_widget.cc
parent426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff)
downloadchromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip
chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz
chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2
Convert string16 to base::string16 in content.
BUG= Review URL: https://codereview.chromium.org/102593002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget.cc')
-rw-r--r--content/renderer/render_widget.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 544e4c9..17512f2 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -2105,7 +2105,7 @@ void RenderWidget::OnCandidateWindowHidden() {
}
void RenderWidget::OnImeSetComposition(
- const string16& text,
+ const base::string16& text,
const std::vector<WebCompositionUnderline>& underlines,
int selection_start, int selection_end) {
if (!ShouldHandleImeEvent())
@@ -2124,7 +2124,7 @@ void RenderWidget::OnImeSetComposition(
#endif
}
-void RenderWidget::OnImeConfirmComposition(const string16& text,
+void RenderWidget::OnImeConfirmComposition(const base::string16& text,
const gfx::Range& replacement_range,
bool keep_selection) {
if (!ShouldHandleImeEvent())