From 1d2f46ccd1e5696bfa15c820cb7be66769c715c2 Mon Sep 17 00:00:00 2001
From: "ben@chromium.org"
<ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 10 Oct 2008 17:13:51 +0000
Subject: Roll back trial from last night
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3217 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/views/custom_frame_window.cc | 16 ----------------
chrome/views/custom_frame_window.h | 2 --
chrome/views/hwnd_view_container.h | 4 ----
3 files changed, 22 deletions(-)
(limited to 'chrome')
diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc
index 409413a..a425ea2 100644
--- a/chrome/views/custom_frame_window.cc
+++ b/chrome/views/custom_frame_window.cc
@@ -911,12 +911,6 @@ void CustomFrameWindow::SizeWindowToDefault() {
///////////////////////////////////////////////////////////////////////////////
// CustomFrameWindow, HWNDViewContainer overrides:
-void CustomFrameWindow::OnEnterIdle(UINT reason, HWND window) {
- CRect wr;
- ::GetWindowRect(GetHWND(), &wr);
- PaintNow(wr);
-}
-
static void EnableMenuItem(HMENU menu, UINT command, bool enabled) {
UINT flags = MF_BYCOMMAND | (enabled ? MF_ENABLED : MF_DISABLED | MF_GRAYED);
EnableMenuItem(menu, command, flags);
@@ -936,16 +930,6 @@ void CustomFrameWindow::OnInitMenu(HMENU menu) {
window_delegate()->CanMaximize() && !maximized);
EnableMenuItem(menu, SC_MINIMIZE,
window_delegate()->CanMaximize() && !minimized);
- CRect wr;
- ::GetWindowRect(GetHWND(), &wr);
- PaintNow(wr);
-}
-
-void CustomFrameWindow::OnInitMenuPopup(HMENU menu, UINT position,
- BOOL is_system_menu) {
- CRect wr;
- ::GetWindowRect(GetHWND(), &wr);
- PaintNow(wr);
}
void CustomFrameWindow::OnMouseLeave() {
diff --git a/chrome/views/custom_frame_window.h b/chrome/views/custom_frame_window.h
index 0d89193..6b8238b 100644
--- a/chrome/views/custom_frame_window.h
+++ b/chrome/views/custom_frame_window.h
@@ -48,9 +48,7 @@ class CustomFrameWindow : public Window {
virtual void DisableInactiveRendering(bool disable);
// 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);
diff --git a/chrome/views/hwnd_view_container.h b/chrome/views/hwnd_view_container.h
index 70f255b..069cc87 100644
--- a/chrome/views/hwnd_view_container.h
+++ b/chrome/views/hwnd_view_container.h
@@ -191,7 +191,6 @@ class HWNDViewContainer : public ViewContainer,
MSG_WM_DESTROY(OnDestroy)
MSG_WM_ERASEBKGND(OnEraseBkgnd)
MSG_WM_ENDSESSION(OnEndSession)
- MSG_WM_ENTERIDLE(OnEnterIdle)
MSG_WM_EXITMENULOOP(OnExitMenuLoop)
MSG_WM_GETMINMAXINFO(OnGetMinMaxInfo)
MSG_WM_HSCROLL(OnHScroll)
@@ -359,9 +358,6 @@ class HWNDViewContainer : public ViewContainer,
// leak a few things.
virtual void OnDestroy();
virtual void OnEndSession(BOOL ending, UINT logoff) { SetMsgHandled(FALSE); }
- virtual void OnEnterIdle(UINT reason, HWND window) {
- SetMsgHandled(FALSE);
- }
virtual void OnExitMenuLoop(BOOL is_track_popup_menu) { SetMsgHandled(FALSE); }
virtual LRESULT OnEraseBkgnd(HDC dc);
virtual void OnGetMinMaxInfo(LPMINMAXINFO mm_info) { }
--
cgit v1.1