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

Unified Diff: ui/base/ime/chromeos/ime_bridge.h

Issue 162723003: Migrate CandidateWindow::Entry to string16. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browsertest compilation Created 6 years, 10 months 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/base/ime/candidate_window_unittest.cc ('k') | ui/base/ime/chromeos/mock_ime_candidate_window_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/ime/chromeos/ime_bridge.h
diff --git a/ui/base/ime/chromeos/ime_bridge.h b/ui/base/ime/chromeos/ime_bridge.h
index c7049db32b061f96ef27564f8b581f660d89a515..bf2866568fa25623bafdfe728a9ba4ce895c9ae1 100644
--- a/ui/base/ime/chromeos/ime_bridge.h
+++ b/ui/base/ime/chromeos/ime_bridge.h
@@ -8,6 +8,7 @@
#include <string>
#include "base/basictypes.h"
#include "base/callback.h"
+#include "base/strings/string16.h"
#include "ui/base/ime/text_input_mode.h"
#include "ui/base/ime/text_input_type.h"
#include "ui/base/ui_base_export.h"
@@ -112,8 +113,9 @@ class UI_BASE_EXPORT IBusPanelCandidateWindowHandlerInterface {
bool visible) = 0;
// Called when the IME updates the preedit text. The |text| is given in
- // UTF-8 encoding.
- virtual void UpdatePreeditText(const std::string& text, uint32 cursor_pos,
+ // UTF-16 encoding.
+ virtual void UpdatePreeditText(const base::string16& text,
+ uint32 cursor_pos,
bool visible) = 0;
// Called when the application changes its caret bounds.
« no previous file with comments | « ui/base/ime/candidate_window_unittest.cc ('k') | ui/base/ime/chromeos/mock_ime_candidate_window_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698