| Index: webkit/plugins/npapi/webplugin_ime_win.cc
|
| diff --git a/webkit/plugins/npapi/webplugin_ime_win.cc b/webkit/plugins/npapi/webplugin_ime_win.cc
|
| index 10c528198b1968d70039ea3a22d431a3beff3905..46bfaa9f0b6352ee195c890b4a09e7bccf4898e3 100644
|
| --- a/webkit/plugins/npapi/webplugin_ime_win.cc
|
| +++ b/webkit/plugins/npapi/webplugin_ime_win.cc
|
| @@ -40,7 +40,7 @@ WebPluginIMEWin::WebPluginIMEWin()
|
| WebPluginIMEWin::~WebPluginIMEWin() {
|
| }
|
|
|
| -void WebPluginIMEWin::CompositionUpdated(const string16& text,
|
| +void WebPluginIMEWin::CompositionUpdated(const base::string16& text,
|
| std::vector<int> clauses,
|
| std::vector<int> target,
|
| int cursor_position) {
|
| @@ -88,7 +88,7 @@ void WebPluginIMEWin::CompositionUpdated(const string16& text,
|
| delta_start_ = cursor_position;
|
| }
|
|
|
| -void WebPluginIMEWin::CompositionCompleted(const string16& text) {
|
| +void WebPluginIMEWin::CompositionCompleted(const base::string16& text) {
|
| composing_text_ = false;
|
|
|
| // We should update the following values when we finish a composition:
|
|
|