diff options
author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 17:51:28 +0000 |
---|---|---|
committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-02 17:51:28 +0000 |
commit | 06b61d9b949354608e2c2325da6a086582ac8581 (patch) | |
tree | a24434b510c57557b21e1544618e7894e09b9fe0 /ui/views/controls/textfield/native_textfield_win.cc | |
parent | 40cb85ee3a816f20b324b8b4e9fc195e4b5a966d (diff) | |
download | chromium_src-06b61d9b949354608e2c2325da6a086582ac8581.zip chromium_src-06b61d9b949354608e2c2325da6a086582ac8581.tar.gz chromium_src-06b61d9b949354608e2c2325da6a086582ac8581.tar.bz2 |
Clean Up: TSF related stuff
This clean up CL contains:
1. Rename TSF acronym from Tsf to TSF based on 11141019.
2. Use STDMETHOD_ instead of STDMETHODIMP suggested on 11235023.
3. Use override comment suggested on 11235023
BUG=None
TBR=mark@chromium.org
TEST=checked on Windows 8 and try bots
Review URL: https://chromiumcodereview.appspot.com/11341036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165700 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/textfield/native_textfield_win.cc')
-rw-r--r-- | ui/views/controls/textfield/native_textfield_win.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc index ab3749e..d2ca187 100644 --- a/ui/views/controls/textfield/native_textfield_win.cc +++ b/ui/views/controls/textfield/native_textfield_win.cc @@ -98,8 +98,8 @@ NativeTextfieldWin::NativeTextfieldWin(Textfield* textfield) container_view_(new NativeViewHost), bg_color_(0), ALLOW_THIS_IN_INITIALIZER_LIST( - tsf_event_router_(base::win::IsTsfAwareRequired() ? - new ui::TsfEventRouter(this) : NULL)) { + tsf_event_router_(base::win::IsTSFAwareRequired() ? + new ui::TSFEventRouter(this) : NULL)) { if (!loaded_libarary_module_) { // msftedit.dll is RichEdit ver 4.1. // This version is available from WinXP SP1 and has TSF support. @@ -348,7 +348,7 @@ bool NativeTextfieldWin::IsIMEComposing() const { // Retrieve the length of the composition string to check if an IME is // composing text. (If this length is > 0 then an IME is being used to compose // text.) - if (base::win::IsTsfAwareRequired()) + if (base::win::IsTSFAwareRequired()) return tsf_event_router_->IsImeComposing(); HIMC imm_context = ImmGetContext(m_hWnd); @@ -507,11 +507,11 @@ void NativeTextfieldWin::OnImeEndCompositionInternal() { textfield_->SyncText(); } -void NativeTextfieldWin::OnTsfStartComposition() { +void NativeTextfieldWin::OnTSFStartComposition() { OnImeStartCompositionInternal(); } -void NativeTextfieldWin::OnTsfEndComposition() { +void NativeTextfieldWin::OnTSFEndComposition() { OnImeEndCompositionInternal(); } @@ -620,7 +620,7 @@ void NativeTextfieldWin::OnCopy() { } LRESULT NativeTextfieldWin::OnCreate(const CREATESTRUCTW* /*create_struct*/) { - if (base::win::IsTsfAwareRequired()) { + if (base::win::IsTSFAwareRequired()) { // Enable TSF support of RichEdit. SetEditStyle(SES_USECTF, SES_USECTF); @@ -1053,7 +1053,7 @@ void NativeTextfieldWin::OnSetFocus(HWND hwnd) { } focus_manager->SetFocusedView(textfield_); - if (!base::win::IsTsfAwareRequired()) { + if (!base::win::IsTSFAwareRequired()) { return; } @@ -1062,7 +1062,7 @@ void NativeTextfieldWin::OnSetFocus(HWND hwnd) { // Document manager created by RichEdit can be obtained only after // WM_SET_FOCUS event is handled. tsf_event_router_->SetManager( - ui::TsfBridge::GetInstance()->GetThreadManager()); + ui::TSFBridge::GetInstance()->GetThreadManager()); SetMsgHandled(TRUE); } |