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/views | |
| 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/views')
| -rw-r--r-- | chrome/browser/views/download_started_animation.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/info_bubble.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/views/status_bubble.cc | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc index 3131a31..d66b789 100644 --- a/chrome/browser/views/download_started_animation.cc +++ b/chrome/browser/views/download_started_animation.cc @@ -74,7 +74,8 @@ DownloadStartedAnimation::DownloadStartedAnimation(TabContents* tab_contents) popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW | WS_EX_TRANSPARENT); popup_->SetLayeredAlpha(0x00); - popup_->Init(tab_contents_->GetContainerHWND(), rc, this, false); + popup_->Init(tab_contents_->GetContainerHWND(), rc, false); + popup_->SetContentsView(this); Reposition(); popup_->ShowWindow(SW_SHOWNOACTIVATE); diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index b307a98..a9671f6 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -132,7 +132,8 @@ void InfoBubble::Init(HWND parent_hwnd, (win_util::GetWinVersion() < win_util::WINVERSION_XP) ? 0 : CS_DROPSHADOW); - HWNDViewContainer::Init(parent_hwnd, bounds, content_view_, true); + HWNDViewContainer::Init(parent_hwnd, bounds, true); + SetContentsView(content_view_); // The preferred size may differ when parented. Ask for the bounds again // and if they differ reset the bounds. gfx::Rect parented_bounds = content_view_-> diff --git a/chrome/browser/views/status_bubble.cc b/chrome/browser/views/status_bubble.cc index 69985cd..04b44f3 100644 --- a/chrome/browser/views/status_bubble.cc +++ b/chrome/browser/views/status_bubble.cc @@ -505,8 +505,8 @@ void StatusBubble::Init() { WS_EX_TRANSPARENT | l10n_util::GetExtendedTooltipStyles()); popup_->SetLayeredAlpha(0x00); - popup_->Init(frame_->GetHWND(), rc, view_, - false); + popup_->Init(frame_->GetHWND(), rc, false); + popup_->SetContentsView(view_); Reposition(); popup_->ShowWindow(SW_SHOWNOACTIVATE); } |