summaryrefslogtreecommitdiffstats
path: root/chrome/views/hwnd_view_container.h
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 23:09:11 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-14 23:09:11 +0000
commit0d62def999bb7ffe731256a98cdb6be184e067b2 (patch)
tree7a449bb520e67921a7a5257a1e4627e48c1e4e13 /chrome/views/hwnd_view_container.h
parentbb69e9b391b68274089c5a6148548683af54bb19 (diff)
downloadchromium_src-0d62def999bb7ffe731256a98cdb6be184e067b2.zip
chromium_src-0d62def999bb7ffe731256a98cdb6be184e067b2.tar.gz
chromium_src-0d62def999bb7ffe731256a98cdb6be184e067b2.tar.bz2
Hook up the system menu in new frames.
BUG=1319684 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/views/hwnd_view_container.h')
-rw-r--r--chrome/views/hwnd_view_container.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/views/hwnd_view_container.h b/chrome/views/hwnd_view_container.h
index 1ce41f2..3c792d1 100644
--- a/chrome/views/hwnd_view_container.h
+++ b/chrome/views/hwnd_view_container.h
@@ -193,9 +193,11 @@ class HWNDViewContainer : public ViewContainer,
MSG_WM_DESTROY(OnDestroy)
MSG_WM_ERASEBKGND(OnEraseBkgnd)
MSG_WM_ENDSESSION(OnEndSession)
+ MSG_WM_EXITMENULOOP(OnExitMenuLoop)
MSG_WM_GETMINMAXINFO(OnGetMinMaxInfo)
MSG_WM_HSCROLL(OnHScroll)
MSG_WM_INITMENU(OnInitMenu)
+ MSG_WM_INITMENUPOPUP(OnInitMenuPopup)
MSG_WM_KEYDOWN(OnKeyDown)
MSG_WM_KEYUP(OnKeyUp)
MSG_WM_LBUTTONDBLCLK(OnLButtonDblClk)
@@ -351,6 +353,7 @@ class HWNDViewContainer : public ViewContainer,
// leak a few things.
virtual void OnDestroy();
virtual void OnEndSession(BOOL ending, UINT logoff) { SetMsgHandled(FALSE); }
+ virtual void OnExitMenuLoop(BOOL is_track_popup_menu) { SetMsgHandled(FALSE); }
virtual LRESULT OnEraseBkgnd(HDC dc);
virtual void OnGetMinMaxInfo(LPMINMAXINFO mm_info) { }
virtual LRESULT OnGetObject(UINT uMsg, WPARAM w_param, LPARAM l_param);
@@ -358,6 +361,9 @@ class HWNDViewContainer : public ViewContainer,
SetMsgHandled(FALSE);
}
virtual void OnInitMenu(HMENU menu) { SetMsgHandled(FALSE); }
+ virtual void OnInitMenuPopup(HMENU menu, UINT position, BOOL is_system_menu) {
+ SetMsgHandled(FALSE);
+ }
virtual void OnKeyDown(TCHAR c, UINT rep_cnt, UINT flags);
virtual void OnKeyUp(TCHAR c, UINT rep_cnt, UINT flags);
virtual void OnLButtonDblClk(UINT flags, const CPoint& point);