diff options
author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:08:41 +0000 |
---|---|---|
committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-19 23:08:41 +0000 |
commit | 42c35a5997f5b11522ee308c19d334146ac6895a (patch) | |
tree | cb46a30551e8eb5112a6c6ba4d9a9284e2dedcfe /chrome/browser/views/tabs | |
parent | a109d02492863aeb537dea09bfb445eb6f5d94c5 (diff) | |
download | chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.zip chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.gz chromium_src-42c35a5997f5b11522ee308c19d334146ac6895a.tar.bz2 |
Reverting 18872.
Broke the Windows build.
BUG=None
TEST=None
TBR=ben
Review URL: http://codereview.chromium.org/140023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tabs')
4 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index adf7903..b4fea1d 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()); + popup->Init(NULL, info.GetPopupRect(), false); 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 b77ace5..f3101d9 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)); + container_->Init(NULL, gfx::Rect(0, 0, 0, 0), false); 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 6f78ea9..430e009 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); + capture_window_->Init(NULL, capture_bounds, false); // 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 b5f0aae..d669be3 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -1382,7 +1382,8 @@ 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)); + gfx::Rect(0, 0, drop_indicator_width, drop_indicator_height), + true); arrow_window->SetContentsView(arrow_view); #else NOTIMPLEMENTED(); |