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

2 files changed, 16 insertions, 16 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);
 }
 
diff --git a/ui/views/controls/textfield/native_textfield_win.h b/ui/views/controls/textfield/native_textfield_win.h
index 08aba4c..e759f76 100644
--- a/ui/views/controls/textfield/native_textfield_win.h
+++ b/ui/views/controls/textfield/native_textfield_win.h
@@ -44,7 +44,7 @@ class NativeTextfieldWin
       public CRichEditCommands<NativeTextfieldWin>,
       public NativeTextfieldWrapper,
       public ui::SimpleMenuModel::Delegate,
-      public ui::TsfEventRouterObserver {
+      public ui::TSFEventRouterObserver {
  public:
   DECLARE_WND_SUPERCLASS(L"ViewsTextfieldEdit", MSFTEDIT_CLASS);
 
@@ -66,7 +66,7 @@ class NativeTextfieldWin
   // See the code in textfield.cc that calls this for why this is here.
   void AttachHack();
 
-  // Overridden from NativeTextfieldWrapper:
+  // NativeTextfieldWrapper:
   virtual string16 GetText() const OVERRIDE;
   virtual void UpdateText() OVERRIDE;
   virtual void AppendText(const string16& text) OVERRIDE;
@@ -104,7 +104,7 @@ class NativeTextfieldWin
   virtual void ClearEditHistory() OVERRIDE;
   virtual int GetFontHeight() OVERRIDE;
 
-  // Overridden from ui::SimpleMenuModel::Delegate:
+  // ui::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
@@ -112,10 +112,10 @@ class NativeTextfieldWin
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
-  // Overridden from ui::TsfEventRouterObserver:
+  // ui::TSFEventRouterObserver:
   virtual void OnTextUpdated(const ui::Range& composition_range) OVERRIDE;
-  virtual void OnTsfStartComposition() OVERRIDE;
-  virtual void OnTsfEndComposition() OVERRIDE;
+  virtual void OnTSFStartComposition() OVERRIDE;
+  virtual void OnTSFEndComposition() OVERRIDE;
 
   // Update accessibility information.
   void InitializeAccessibilityInfo();
@@ -189,7 +189,7 @@ class NativeTextfieldWin
     DISALLOW_COPY_AND_ASSIGN(ScopedSuspendUndo);
   };
 
-  // message handlers
+  // Message handlers.
   void OnChar(TCHAR key, UINT repeat_count, UINT flags);
   void OnContextMenu(HWND window, const POINT& point);
   void OnCopy();
@@ -315,7 +315,7 @@ class NativeTextfieldWin
   //  The accessibility state of this object.
   int accessibility_state_;
 
-  scoped_ptr<ui::TsfEventRouter> tsf_event_router_;
+  scoped_ptr<ui::TSFEventRouter> tsf_event_router_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTextfieldWin);
 };