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

Unified Diff: win8/metro_driver/ime/text_service.cc

Issue 119733002: Add base:: to string16s in win8/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 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 | « win8/metro_driver/file_picker_ash.cc ('k') | win8/metro_driver/ime/text_service_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: win8/metro_driver/ime/text_service.cc
diff --git a/win8/metro_driver/ime/text_service.cc b/win8/metro_driver/ime/text_service.cc
index 7147d201f795a941444f8e97728f173598589c72..d9015cad7486a477f4925a9dfa4e99aa32240268 100644
--- a/win8/metro_driver/ime/text_service.cc
+++ b/win8/metro_driver/ime/text_service.cc
@@ -374,7 +374,7 @@ class TextServiceImpl : public TextService,
}
virtual void OnCompositionChanged(
- const string16& text,
+ const base::string16& text,
int32 selection_start,
int32 selection_end,
const std::vector<metro_viewer::UnderlineInfo>& underlines) OVERRIDE {
@@ -386,7 +386,7 @@ class TextServiceImpl : public TextService,
underlines);
}
- virtual void OnTextCommitted(const string16& text) OVERRIDE {
+ virtual void OnTextCommitted(const base::string16& text) OVERRIDE {
if (!delegate_)
return;
delegate_->OnTextCommitted(text);
« no previous file with comments | « win8/metro_driver/file_picker_ash.cc ('k') | win8/metro_driver/ime/text_service_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698