From 82166b65c8cdd7cb855c2d018be8c6c815324af6 Mon Sep 17 00:00:00 2001 From: "jcampan@chromium.org" Date: Tue, 30 Jun 2009 18:48:00 +0000 Subject: This CL removes the last (major) Windows specific part out of the focus manager. It was previously landed and reverted because it broke the reliability tests. http://codereview.chromium.org/125148 The breakage was caused by constrained windows not getting a hold of the FocusManager when in unparented tabs. The fix is to ensure unparented tab still have a way to access their FocusManager for proper closure. Files changed from the previous patch that need reviewing: native_tab_contents_container_win.cc tab_contents_view_win.h tab_contents_view_win.cc BUG=None TEST=Run all tests (unit, ui, interactive). Extensively test the focus in Chrome. Review URL: http://codereview.chromium.org/146093 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19617 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/tabs/dragged_tab_controller.cc | 2 +- chrome/browser/views/tabs/dragged_tab_view.cc | 2 +- chrome/browser/views/tabs/native_view_photobooth_win.cc | 2 +- chrome/browser/views/tabs/tab_strip.cc | 3 +-- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'chrome/browser/views/tabs') diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index b4fea1d..adf7903 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -198,7 +198,7 @@ class DraggedTabController::DockDisplayer : public AnimationDelegate { popup->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | WS_EX_TOPMOST); popup->SetOpacity(0x00); - popup->Init(NULL, info.GetPopupRect(), false); + popup->Init(NULL, info.GetPopupRect()); popup->SetContentsView(new DockView(info.type())); if (info.in_enable_area()) animation_.Reset(1); diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index f3101d9..b77ace5 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -48,7 +48,7 @@ DraggedTabView::DraggedTabView(TabContents* datasource, container_->set_window_ex_style( WS_EX_LAYERED | WS_EX_TOPMOST | WS_EX_TOOLWINDOW); container_->set_can_update_layered_window(false); - container_->Init(NULL, gfx::Rect(0, 0, 0, 0), false); + container_->Init(NULL, gfx::Rect(0, 0, 0, 0)); container_->SetContentsView(this); BOOL drag; diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.cc b/chrome/browser/views/tabs/native_view_photobooth_win.cc index 430e009..6f78ea9 100644 --- a/chrome/browser/views/tabs/native_view_photobooth_win.cc +++ b/chrome/browser/views/tabs/native_view_photobooth_win.cc @@ -155,7 +155,7 @@ void NativeViewPhotoboothWin::CreateCaptureWindow(HWND initial_hwnd) { // WS_EX_TOOLWINDOW ensures the capture window doesn't produce a Taskbar // button. capture_window_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW); - capture_window_->Init(NULL, capture_bounds, false); + capture_window_->Init(NULL, capture_bounds); // If the capture window isn't visible, blitting from the TabContents' // HWND's DC to the capture bitmap produces blankness. capture_window_->Show(); diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 089925e..d9e7952 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -1388,8 +1388,7 @@ TabStrip::DropInfo::DropInfo(int drop_index, bool drop_before, bool point_down) arrow_window->Init( NULL, - gfx::Rect(0, 0, drop_indicator_width, drop_indicator_height), - true); + gfx::Rect(0, 0, drop_indicator_width, drop_indicator_height)); arrow_window->SetContentsView(arrow_view); #else NOTIMPLEMENTED(); -- cgit v1.1