| Index: ui/base/win/singleton_hwnd.h
|
| ===================================================================
|
| --- ui/base/win/singleton_hwnd.h (revision 130121)
|
| +++ ui/base/win/singleton_hwnd.h (working copy)
|
| @@ -12,6 +12,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/callback_forward.h"
|
| #include "base/observer_list.h"
|
| +#include "ui/base/win/window_impl.h"
|
|
|
| template<typename T> struct DefaultSingletonTraits;
|
|
|
| @@ -19,7 +20,7 @@
|
|
|
| // Singleton message-only HWND that allows interested clients to receive WM_*
|
| // notifications.
|
| -class SingletonHwnd {
|
| +class SingletonHwnd : public WindowImpl {
|
| public:
|
| static SingletonHwnd* GetInstance();
|
|
|
| @@ -37,7 +38,12 @@
|
| void RemoveObserver(Observer* observer);
|
|
|
| // Windows callback for WM_* notifications.
|
| - void OnWndProc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam);
|
| + virtual BOOL ProcessWindowMessage(HWND window,
|
| + UINT message,
|
| + WPARAM wparam,
|
| + LPARAM lparam,
|
| + LRESULT& result,
|
| + DWORD msg_map_id) OVERRIDE;
|
|
|
| private:
|
| friend struct DefaultSingletonTraits<SingletonHwnd>;
|
| @@ -45,9 +51,6 @@
|
| SingletonHwnd();
|
| ~SingletonHwnd();
|
|
|
| - // Listener HWND for WM_* notifications.
|
| - HWND listener_window_;
|
| -
|
| // List of registered observers.
|
| ObserverList<Observer> observer_list_;
|
|
|
|
|