Index: chrome/browser/ui/views/omnibox/omnibox_view_win.h |
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.h b/chrome/browser/ui/views/omnibox/omnibox_view_win.h |
index 877ce5c9be203c5f34215659d1d12ff40c73aeab..a1ca573bcb489bcfb28fd3edee594015e3dcbaea 100644 |
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.h |
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.h |
@@ -55,8 +55,6 @@ class OmniboxViewWin |
const CHARRANGE saved_selection_for_focus_change; |
}; |
- DECLARE_WND_CLASS(L"Chrome_OmniboxView"); |
- |
OmniboxViewWin(OmniboxEditController* controller, |
ToolbarModel* toolbar_model, |
LocationBarView* parent_view, |
@@ -66,6 +64,9 @@ class OmniboxViewWin |
views::View* popup_parent_view); |
~OmniboxViewWin(); |
+ // This is equivalent to DECLARE_WND_CLASS. |
+ static CWndClassInfo& GetWndClassInfo(); |
+ |
// Gets the relative window for the specified native view. |
static gfx::NativeView GetRelativeWindowForNativeView( |
gfx::NativeView edit_native_view); |
@@ -153,6 +154,7 @@ class OmniboxViewWin |
MESSAGE_HANDLER_EX(WM_IME_NOTIFY, OnImeNotify) |
MESSAGE_HANDLER_EX(WM_POINTERDOWN, OnPointerDown) |
MESSAGE_HANDLER_EX(WM_POINTERUP, OnPointerUp) |
+ MSG_WM_CREATE(OnCreate) |
MSG_WM_KEYDOWN(OnKeyDown) |
MSG_WM_KEYUP(OnKeyUp) |
MSG_WM_KILLFOCUS(OnKillFocus) |
@@ -245,6 +247,7 @@ class OmniboxViewWin |
void OnChar(TCHAR ch, UINT repeat_count, UINT flags); |
void OnContextMenu(HWND window, const CPoint& point); |
void OnCopy(); |
+ LRESULT OnCreate(const CREATESTRUCTW* create_struct); |
void OnCut(); |
LRESULT OnGetObject(UINT message, WPARAM wparam, LPARAM lparam); |
LRESULT OnImeComposition(UINT message, WPARAM wparam, LPARAM lparam); |
@@ -502,6 +505,9 @@ class OmniboxViewWin |
// The native view host. |
views::NativeViewHost* native_view_host_; |
+ // Flag watching to load RichEdit dll. |
+ static bool did_load_library_; |
+ |
DISALLOW_COPY_AND_ASSIGN(OmniboxViewWin); |
}; |