diff options
Diffstat (limited to 'chromium/win8/metro_driver/ime/text_service.cc')
| -rw-r--r-- | chromium/win8/metro_driver/ime/text_service.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/win8/metro_driver/ime/text_service.cc b/chromium/win8/metro_driver/ime/text_service.cc index 7147d201f79..dbb74f35d4a 100644 --- a/chromium/win8/metro_driver/ime/text_service.cc +++ b/chromium/win8/metro_driver/ime/text_service.cc @@ -46,7 +46,7 @@ // TextServiceImpl // -> ChromeAppViewAsh // -- (process boundary) -- -// -> RemoteRootWindowHostWin +// -> RemoteWindowTreeHostWin // -> RemoteInputMethodWin // // browser process -> metro_driver process @@ -55,7 +55,7 @@ // - MetroViewerHostMsg_ImeTextInputClientUpdated // Message Routing: // RemoteInputMethodWin -// -> RemoteRootWindowHostWin +// -> RemoteWindowTreeHostWin // -- (process boundary) -- // -> ChromeAppViewAsh // -> TextServiceImpl @@ -334,7 +334,7 @@ class TextServiceImpl : public TextService, private: // TextService overrides: - virtual void TextService::CancelComposition() OVERRIDE { + virtual void CancelComposition() OVERRIDE { if (!current_document_) { VLOG(0) << "|current_document_| is NULL due to the previous error."; return; @@ -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); |