summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/gtk_im_context_wrapper.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/browser/renderer_host/gtk_im_context_wrapper.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/browser/renderer_host/gtk_im_context_wrapper.cc')
-rw-r--r--content/browser/renderer_host/gtk_im_context_wrapper.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/renderer_host/gtk_im_context_wrapper.cc b/content/browser/renderer_host/gtk_im_context_wrapper.cc
index 7ce6558..d4b7789 100644
--- a/content/browser/renderer_host/gtk_im_context_wrapper.cc
+++ b/content/browser/renderer_host/gtk_im_context_wrapper.cc
@@ -477,7 +477,7 @@ void GtkIMContextWrapper::ConfirmComposition() {
if (host_view_->GetRenderWidgetHost()) {
RenderWidgetHostImpl::From(
host_view_->GetRenderWidgetHost())->ImeConfirmComposition(
- string16(), gfx::Range::InvalidRange(), false);
+ base::string16(), gfx::Range::InvalidRange(), false);
}
// Reset the input method.
@@ -485,7 +485,7 @@ void GtkIMContextWrapper::ConfirmComposition() {
}
}
-void GtkIMContextWrapper::HandleCommit(const string16& text) {
+void GtkIMContextWrapper::HandleCommit(const base::string16& text) {
if (suppress_next_commit_)
return;