Improve omnibox accessibility on Windows.

chrome/browser/ui/views/omnibox/omnibox_view_win.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_
 #pragma once
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ skipping 10 matching lines @@
 #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/font.h"
 #include "views/controls/menu/menu_2.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditController;
 class AutocompleteEditModel;
 class AutocompletePopupView;
 class LocationBarView;
+class OmniboxViewWrapper;
 class TabContents;
 
 namespace views {
+class NativeViewHost;
 class View;
 }
 
 // Provides the implementation of an edit control with a drop-down
 // autocomplete box. The box itself is implemented in autocomplete_popup.cc
 // This file implements the edit box and management for the popup.
 class OmniboxViewWin
     : public CWindowImpl<OmniboxViewWin,
                          CRichEditCtrl,
                          CWinTraits<WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL |
@@ skipping 66 matching lines @@
                            bool update_popup) OVERRIDE;
 
   virtual void SetWindowTextAndCaretPos(const string16& text,
                                         size_t caret_pos) OVERRIDE;
 
   virtual void SetForcedQuery() OVERRIDE;
 
   virtual bool IsSelectAll() OVERRIDE;
   virtual bool DeleteAtEndPressed() OVERRIDE;
   virtual void GetSelectionBounds(string16::size_type* start,
-                                  string16::size_type* end) OVERRIDE;
+                                  string16::size_type* end) const OVERRIDE;
   virtual void SelectAll(bool reversed) OVERRIDE;
   virtual void RevertAll() OVERRIDE;
 
   virtual void UpdatePopup() OVERRIDE;
   virtual void ClosePopup() OVERRIDE;
 
   virtual void SetFocus() OVERRIDE;
 
   virtual void OnTemporaryTextMaybeChanged(
       const string16& display_text,
@@ skipping 10 matching lines @@
                                     bool animate_to_complete) OVERRIDE;
   virtual int TextWidth() const OVERRIDE;
   virtual string16 GetInstantSuggestion() const OVERRIDE;
   virtual bool IsImeComposing() const OVERRIDE;
 
   virtual views::View* AddToView(views::View* parent) OVERRIDE;
   virtual int OnPerformDrop(const views::DropTargetEvent& event) OVERRIDE;
 
   int GetPopupMaxYCoordinate();
 
-  // Exposes custom IAccessible implementation to the overall MSAA hierarchy.
-  IAccessible* GetIAccessible();
-
   void SetDropHighlightPosition(int position);
   int drop_highlight_position() const { return drop_highlight_position_; }
 
   // Returns true if a drag a drop session was initiated by this edit.
   bool in_drag() const { return in_drag_; }
 
   // Moves the selected text to the specified position.
   void MoveSelectedText(int new_position);
 
   // Inserts the text at the specified position.
@@ skipping 111 matching lines @@
                                     int action);
 
   // Returns true if |edit_text| starting at |current_pos| is "://".
   static bool SchemeEnd(LPTSTR edit_text, int current_pos, int length);
 
   // Message handlers
   void OnChar(TCHAR ch, UINT repeat_count, UINT flags);
   void OnContextMenu(HWND window, const CPoint& point);
   void OnCopy();
   void OnCut();
-  LRESULT OnGetObject(UINT uMsg, WPARAM wparam, LPARAM lparam);
+  LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam);
   LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam);
   void OnKeyDown(TCHAR key, UINT repeat_count, UINT flags);
   void OnKeyUp(TCHAR key, UINT repeat_count, UINT flags);
   void OnKillFocus(HWND focus_wnd);
   void OnLButtonDblClk(UINT keys, const CPoint& point);
   void OnLButtonDown(UINT keys, const CPoint& point);
   void OnLButtonUp(UINT keys, const CPoint& point);
   void OnMButtonDblClk(UINT keys, const CPoint& point);
   void OnMButtonDown(UINT keys, const CPoint& point);
   void OnMButtonUp(UINT keys, const CPoint& point);
@@ skipping 241 matching lines @@
   // This interface is useful for accessing the CRichEditCtrl at a low level.
   mutable ITextDocument* text_object_model_;
 
   // This contains the scheme char start and stop indexes that should be
   // stricken-out when displaying an insecure scheme.
   url_parse::Component insecure_scheme_component_;
 
   // Instance of accessibility information and handling.
   mutable base::win::ScopedComPtr<IAccessible> autocomplete_accessibility_;
 
+  // The native view host.
+  views::NativeViewHost* native_view_host_;
+
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_OMNIBOX_OMNIBOX_VIEW_WIN_H_