diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 22:55:03 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-04 22:55:03 +0000 |
| commit | 7e24ec474cdcf17f2c97b6e8a7a153d790a032c1 (patch) | |
| tree | 9d9150dfe2aa25c696076b69826e8b132f129edf /views/controls/native_control_win.h | |
| parent | d11535a810717cd12a32a1a98080b2029c838547 (diff) | |
| download | chromium_src-7e24ec474cdcf17f2c97b6e8a7a153d790a032c1.zip chromium_src-7e24ec474cdcf17f2c97b6e8a7a153d790a032c1.tar.gz chromium_src-7e24ec474cdcf17f2c97b6e8a7a153d790a032c1.tar.bz2 | |
Revert 65109 - Adds the ability for classes other than native control to process
messages bounced to the parent and wires it up for autocompleteedit,
which I'm going to need shortly.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/4470001
TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/4528001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/native_control_win.h')
| -rw-r--r-- | views/controls/native_control_win.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/views/controls/native_control_win.h b/views/controls/native_control_win.h index 3733a15..6d0fdf0 100644 --- a/views/controls/native_control_win.h +++ b/views/controls/native_control_win.h @@ -7,10 +7,8 @@ #pragma once #include "base/scoped_ptr.h" -#include "base/scoped_vector.h" #include "views/controls/combobox/combobox.h" #include "views/controls/native/native_view_host.h" -#include "views/widget/child_window_message_processor.h" namespace app { namespace win { @@ -21,13 +19,19 @@ class ScopedProp; namespace views { // A View that hosts a native Windows control. -class NativeControlWin : public ChildWindowMessageProcessor, - public NativeViewHost { +class NativeControlWin : public NativeViewHost { public: + static const wchar_t* kNativeControlWinKey; + NativeControlWin(); virtual ~NativeControlWin(); - // Overridden from ChildWindowMessageProcessor: + // Called by the containing WidgetWin when a message is received from the HWND + // created by an object derived from NativeControlWin. Derived classes MUST + // call _this_ version of the function if they override it and do not handle + // all of the messages listed in widget_win.cc ProcessNativeControlWinMessage. + // Returns true if the message was handled, with a valid result in |result|. + // Returns false if the message was not handled. virtual bool ProcessMessage(UINT message, WPARAM w_param, LPARAM l_param, @@ -75,8 +79,6 @@ class NativeControlWin : public ChildWindowMessageProcessor, DWORD GetAdditionalRTLStyle() const; private: - typedef ScopedVector<app::win::ScopedProp> ScopedProps; - // Called by the containing WidgetWin when a message of type WM_CTLCOLORBTN or // WM_CTLCOLORSTATIC is sent from the HWND created by an object dreived from // NativeControlWin. @@ -91,7 +93,7 @@ class NativeControlWin : public ChildWindowMessageProcessor, // The window procedure before we subclassed. WNDPROC original_wndproc_; - ScopedProps props_; + scoped_ptr<app::win::ScopedProp> prop_; DISALLOW_COPY_AND_ASSIGN(NativeControlWin); }; |