From d6598c050acb33ef7a64d32b116a6f10ba941329 Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Wed, 5 Nov 2008 19:03:25 +0000 Subject: This is r4523, with a few changes to make things work under Vista. - Explicitly set_delegate(NULL) before releasing a TabContents. (I think the order messages are getting handled is different from XP; this only seems neccessary under Vista.) - r4523 and someone elses change added entries to theme_resources.rc at roughly the same time, causing happy fun crashes. - Roll in sgk's SConscript fix. Review URL: http://codereview.chromium.org/9373 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4799 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/frame/browser_view2.cc | 35 ----------------------------- 1 file changed, 35 deletions(-) (limited to 'chrome/browser/views/frame/browser_view2.cc') diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc index 477a910..7081665 100644 --- a/chrome/browser/views/frame/browser_view2.cc +++ b/chrome/browser/views/frame/browser_view2.cc @@ -351,40 +351,6 @@ void BrowserView2::FlashFrame() { FlashWindowEx(&fwi); } -void BrowserView2::ContinueDetachConstrainedWindowDrag( - const gfx::Point& mouse_point, - int frame_component) { - HWND vc_hwnd = GetContainer()->GetHWND(); - if (frame_component == HTCLIENT) { - // If the user's mouse was over the content area of the popup when they - // clicked down, we need to re-play the mouse down event so as to actually - // send the click to the renderer. If we don't do this, the user needs to - // click again once the window is detached to interact. - HWND inner_hwnd = browser_->GetSelectedTabContents()->GetContentHWND(); - POINT window_point = mouse_point.ToPOINT(); - MapWindowPoints(HWND_DESKTOP, inner_hwnd, &window_point, 1); - PostMessage(inner_hwnd, WM_LBUTTONDOWN, MK_LBUTTON, - MAKELPARAM(window_point.x, window_point.y)); - } else if (frame_component != HTNOWHERE) { - // The user's mouse is already moving, and the left button is down, but we - // need to start moving this frame, so we _post_ it a NCLBUTTONDOWN message - // with the corresponding frame component as supplied by the constrained - // window where the user clicked. This tricks Windows into believing the - // user just started performing that operation on the newly created window. - // All the frame moving and sizing is then handled automatically by - // Windows. We use PostMessage because we need to return to the message - // loop first for Windows' built in moving/sizing to be triggered. - POINTS pts; - pts.x = mouse_point.x(); - pts.y = mouse_point.y(); - PostMessage(vc_hwnd, WM_NCLBUTTONDOWN, frame_component, - reinterpret_cast(&pts)); - // Also make sure the right cursor for the action is set. - PostMessage(vc_hwnd, WM_SETCURSOR, reinterpret_cast(vc_hwnd), - frame_component); - } -} - void BrowserView2::SizeToContents(const gfx::Rect& contents_bounds) { frame_->SizeToContents(contents_bounds); } @@ -1192,4 +1158,3 @@ void BrowserView2::InitClass() { initialized = true; } } - -- cgit v1.1