diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/browser/renderer_host/render_widget_host_view_aura.cc | |
parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
download | chromium_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/render_widget_host_view_aura.cc')
-rw-r--r-- | content/browser/renderer_host/render_widget_host_view_aura.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index de6c1ed..27db1a4 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc @@ -990,7 +990,8 @@ void RenderWidgetHostViewAura::Destroy() { delete window_; } -void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) { +void RenderWidgetHostViewAura::SetTooltipText( + const base::string16& tooltip_text) { tooltip_ = tooltip_text; aura::Window* root_window = window_->GetRootWindow(); aura::client::TooltipClient* tooltip_client = @@ -1002,7 +1003,7 @@ void RenderWidgetHostViewAura::SetTooltipText(const string16& tooltip_text) { } } -void RenderWidgetHostViewAura::SelectionChanged(const string16& text, +void RenderWidgetHostViewAura::SelectionChanged(const base::string16& text, size_t offset, const gfx::Range& range) { RenderWidgetHostViewBase::SelectionChanged(text, offset, range); @@ -2180,8 +2181,10 @@ void RenderWidgetHostViewAura::SetCompositionText( } void RenderWidgetHostViewAura::ConfirmCompositionText() { - if (host_ && has_composition_text_) - host_->ImeConfirmComposition(string16(), gfx::Range::InvalidRange(), false); + if (host_ && has_composition_text_) { + host_->ImeConfirmComposition(base::string16(), gfx::Range::InvalidRange(), + false); + } has_composition_text_ = false; } @@ -2191,7 +2194,7 @@ void RenderWidgetHostViewAura::ClearCompositionText() { has_composition_text_ = false; } -void RenderWidgetHostViewAura::InsertText(const string16& text) { +void RenderWidgetHostViewAura::InsertText(const base::string16& text) { DCHECK(text_input_type_ != ui::TEXT_INPUT_TYPE_NONE); if (host_) host_->ImeConfirmComposition(text, gfx::Range::InvalidRange(), false); @@ -2326,7 +2329,7 @@ bool RenderWidgetHostViewAura::DeleteRange(const gfx::Range& range) { bool RenderWidgetHostViewAura::GetTextFromRange( const gfx::Range& range, - string16* text) const { + base::string16* text) const { gfx::Range selection_text_range(selection_text_offset_, selection_text_offset_ + selection_text_.length()); @@ -3252,8 +3255,10 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { void RenderWidgetHostViewAura::FinishImeCompositionSession() { if (!has_composition_text_) return; - if (host_) - host_->ImeConfirmComposition(string16(), gfx::Range::InvalidRange(), false); + if (host_) { + host_->ImeConfirmComposition(base::string16(), gfx::Range::InvalidRange(), + false); + } ImeCancelComposition(); } |