diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 23:31:40 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-10-09 23:31:40 +0000 |
| commit | 813ce4b8cc2190d4d2ec12e31efcc94a736c3e49 (patch) | |
| tree | c21a3aeb19f5f84d44dcd3700f39a2bcc6963983 | |
| parent | 1d9cbc0e5ef7ee96d1c7e7b0150e0cf1ca8bb7be (diff) | |
| download | chromium_src-813ce4b8cc2190d4d2ec12e31efcc94a736c3e49.zip chromium_src-813ce4b8cc2190d4d2ec12e31efcc94a736c3e49.tar.gz chromium_src-813ce4b8cc2190d4d2ec12e31efcc94a736c3e49.tar.bz2 | |
Put this file back into its original state when I first landed this change earlier today.
http://crbug.com/3264
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3154 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/views/custom_frame_window.cc | 10 | ||||
| -rw-r--r-- | chrome/views/custom_frame_window.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc index 446a5ed..f2d7bea 100644 --- a/chrome/views/custom_frame_window.cc +++ b/chrome/views/custom_frame_window.cc @@ -936,6 +936,16 @@ void CustomFrameWindow::OnInitMenu(HMENU menu) { window_delegate()->CanMaximize() && !maximized); EnableMenuItem(menu, SC_MINIMIZE, window_delegate()->CanMaximize() && !minimized); + + ScopedVisibilityRemover remover(GetHWND()); + DefWindowProc(GetHWND(), WM_INITMENU, reinterpret_cast<WPARAM>(menu), NULL); +} + +void CustomFrameWindow::OnInitMenuPopup(HMENU menu, UINT position, + BOOL is_system_menu) { + ScopedVisibilityRemover remover(GetHWND()); + DefWindowProc(GetHWND(), WM_INITMENUPOPUP, reinterpret_cast<WPARAM>(menu), + MAKELPARAM(is_system_menu, position)); } void CustomFrameWindow::OnMouseLeave() { diff --git a/chrome/views/custom_frame_window.h b/chrome/views/custom_frame_window.h index 923ae70..0d89193 100644 --- a/chrome/views/custom_frame_window.h +++ b/chrome/views/custom_frame_window.h @@ -50,6 +50,7 @@ class CustomFrameWindow : public Window { // Overridden from HWNDViewContainer: virtual void OnEnterIdle(UINT reason, HWND window); virtual void OnInitMenu(HMENU menu); + virtual void OnInitMenuPopup(HMENU menu, UINT position, BOOL is_system_menu); virtual void OnMouseLeave(); virtual LRESULT OnNCActivate(BOOL active); virtual LRESULT OnNCCalcSize(BOOL mode, LPARAM l_param); |