Add support for WM_GETOBJECT for NativeTextfieldWin.

This enables accessibility support (OSK) for the Find box.


Review URL: http://codereview.chromium.org/10381034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135680 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 25 insertions, 5 deletions

diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc
index 11c6a4d..f037923 100644
--- a/ui/views/controls/textfield/native_textfield_win.cc
+++ b/ui/views/controls/textfield/native_textfield_win.cc
@@ -340,23 +340,30 @@ bool NativeTextfieldWin::IsIMEComposing() const {
 }
 
 void NativeTextfieldWin::GetSelectedRange(ui::Range* range) const {
-  NOTREACHED();
+  // TODO(tommi): Implement.
+  NOTIMPLEMENTED();
+  range->set_start(0);
+  range->set_end(0);
 }
 
 void NativeTextfieldWin::SelectRange(const ui::Range& range) {
-  NOTREACHED();
+  // TODO(tommi): Implement.
+  NOTIMPLEMENTED();
 }
 
 void NativeTextfieldWin::GetSelectionModel(gfx::SelectionModel* sel) const {
-  NOTREACHED();
+  // TODO(tommi): Implement.
+  NOTIMPLEMENTED();
 }
 
 void NativeTextfieldWin::SelectSelectionModel(const gfx::SelectionModel& sel) {
-  NOTREACHED();
+  // TODO(tommi): Implement.
+  NOTIMPLEMENTED();
 }
 
 size_t NativeTextfieldWin::GetCursorPosition() const {
-  NOTREACHED();
+  // TODO(tommi): Implement.
+  NOTIMPLEMENTED();
   return 0U;
 }
 
@@ -561,6 +568,17 @@ void NativeTextfieldWin::OnCut() {
   ReplaceSel(L"", true);
 }
 
+LRESULT NativeTextfieldWin::OnGetObject(UINT message,
+                                        WPARAM wparam,
+                                        LPARAM lparam) {
+  LRESULT ret = 0;
+  if (lparam == OBJID_CLIENT) {
+    ret = LresultFromObject(IID_IAccessible, wparam,
+        textfield_->GetNativeViewAccessible());
+  }
+  return ret;
+}
+
 LRESULT NativeTextfieldWin::OnImeChar(UINT message,
                                       WPARAM wparam,
                                       LPARAM lparam) {
diff --git a/ui/views/controls/textfield/native_textfield_win.h b/ui/views/controls/textfield/native_textfield_win.h
index f8df261..2a7f945 100644
--- a/ui/views/controls/textfield/native_textfield_win.h
+++ b/ui/views/controls/textfield/native_textfield_win.h
@@ -118,6 +118,7 @@ class NativeTextfieldWin
     MSG_WM_CONTEXTMENU(OnContextMenu)
     MSG_WM_COPY(OnCopy)
     MSG_WM_CUT(OnCut)
+    MESSAGE_HANDLER_EX(WM_GETOBJECT, OnGetObject)
     MESSAGE_HANDLER_EX(WM_IME_CHAR, OnImeChar)
     MESSAGE_HANDLER_EX(WM_IME_STARTCOMPOSITION, OnImeStartComposition)
     MESSAGE_HANDLER_EX(WM_IME_COMPOSITION, OnImeComposition)
@@ -179,6 +180,7 @@ class NativeTextfieldWin
   void OnContextMenu(HWND window, const POINT& point);
   void OnCopy();
   void OnCut();
+  LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeChar(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeStartComposition(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam);