Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

Unified Diff: content/renderer/render_widget.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/renderer_clipboard_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 544e4c9cfb269e3505e832ec3bf9c80f4d5b42ed..17512f263c2a9fe29376d460b10eec1b871e21c6 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())
« no previous file with comments | « content/renderer/render_widget.h ('k') | content/renderer/renderer_clipboard_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698