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

Unified Diff: ui/views/ime/mock_input_method.h

Issue 117983002: Prefix string16 with base:: in ui/. (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 | « ui/views/ime/input_method_bridge.cc ('k') | ui/views/ime/mock_input_method.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/ime/mock_input_method.h
diff --git a/ui/views/ime/mock_input_method.h b/ui/views/ime/mock_input_method.h
index fad5315d5fbb196586b346de484af66aa45e8d98..5c5833f7495d16721e24ead6bd96466cfb323d37 100644
--- a/ui/views/ime/mock_input_method.h
+++ b/ui/views/ime/mock_input_method.h
@@ -52,7 +52,7 @@ class VIEWS_EXPORT MockInputMethod : public InputMethodBase {
void Clear();
void SetCompositionTextForNextKey(const ui::CompositionText& composition);
- void SetResultTextForNextKey(const string16& result);
+ void SetResultTextForNextKey(const base::string16& result);
void SetInputLocale(const std::string& locale);
void SetInputTextDirection(base::i18n::TextDirection direction);
@@ -75,7 +75,7 @@ class VIEWS_EXPORT MockInputMethod : public InputMethodBase {
// Result text for the next key event. It'll be cleared automatically after
// dispatching the next key event.
- string16 result_text_;
+ base::string16 result_text_;
// Record call state of corresponding methods. They will be set to false
// automatically before dispatching a key event.
« no previous file with comments | « ui/views/ime/input_method_bridge.cc ('k') | ui/views/ime/mock_input_method.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698