| Index: chrome/browser/ui/views/omnibox/omnibox_view_win.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/omnibox/omnibox_view_win.h (revision 107097)
|
| +++ chrome/browser/ui/views/omnibox/omnibox_view_win.h (working copy)
|
| @@ -28,9 +28,11 @@
|
| class AutocompleteEditModel;
|
| class AutocompletePopupView;
|
| class LocationBarView;
|
| +class OmniboxViewWrapper;
|
| class TabContents;
|
|
|
| namespace views {
|
| +class NativeViewHost;
|
| class View;
|
| }
|
|
|
| @@ -117,7 +119,7 @@
|
| 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;
|
|
|
| @@ -148,9 +150,6 @@
|
|
|
| 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_; }
|
|
|
| @@ -282,7 +281,7 @@
|
| 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);
|
| @@ -544,6 +543,9 @@
|
| // 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);
|
| };
|
|
|
|
|