diff options
| author | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:43:17 +0000 |
|---|---|---|
| committer | beng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 05:43:17 +0000 |
| commit | a8da3a55ce6358c92cc976f105567f67789a2510 (patch) | |
| tree | 26f58f20a9ab36ffe2cc8d563edacec5dfc7d3dd /chrome/browser/tabs | |
| parent | f73bdc8c33f0b395ba058083505209baeedf9f38 (diff) | |
| download | chromium_src-a8da3a55ce6358c92cc976f105567f67789a2510.zip chromium_src-a8da3a55ce6358c92cc976f105567f67789a2510.tar.gz chromium_src-a8da3a55ce6358c92cc976f105567f67789a2510.tar.bz2 | |
Make HWNDViewContainer set up its contents view separately from its Init method.
This is needed as a first step in further adjustments I'm going to be making to
Window, ClientView, etc.
B=1280060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tabs')
| -rw-r--r-- | chrome/browser/tabs/dragged_tab_view.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/tabs/hwnd_photobooth.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/tabs/tab_strip.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/tabs/dragged_tab_view.cc b/chrome/browser/tabs/dragged_tab_view.cc index d452290..bf1a0ba 100644 --- a/chrome/browser/tabs/dragged_tab_view.cc +++ b/chrome/browser/tabs/dragged_tab_view.cc @@ -68,7 +68,8 @@ 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), this, false); + container_->Init(NULL, gfx::Rect(0, 0, 0, 0), false); + container_->SetContentsView(this); } DraggedTabView::~DraggedTabView() { diff --git a/chrome/browser/tabs/hwnd_photobooth.cc b/chrome/browser/tabs/hwnd_photobooth.cc index d8a9348..f44c724 100644 --- a/chrome/browser/tabs/hwnd_photobooth.cc +++ b/chrome/browser/tabs/hwnd_photobooth.cc @@ -173,7 +173,7 @@ void HWNDPhotobooth::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, NULL, false); + 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_->ShowWindow(SW_SHOWNOACTIVATE); diff --git a/chrome/browser/tabs/tab_strip.cc b/chrome/browser/tabs/tab_strip.cc index e3755a4..e6539a9 100644 --- a/chrome/browser/tabs/tab_strip.cc +++ b/chrome/browser/tabs/tab_strip.cc @@ -1264,8 +1264,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), - arrow_view, true); + arrow_window->SetContentsView(arrow_view); } TabStrip::DropInfo::~DropInfo() { |