summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-11 21:24:18 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-11 21:24:18 +0000
commit3c3651b12c736550eb815bcc88e7dbe521225fac (patch)
treef6558d14de235a6df2e34beca52518a2406a4c81 /chrome/browser/views
parent3117306367ccfee1595e668ffc1101979c4823e8 (diff)
downloadchromium_src-3c3651b12c736550eb815bcc88e7dbe521225fac.zip
chromium_src-3c3651b12c736550eb815bcc88e7dbe521225fac.tar.gz
chromium_src-3c3651b12c736550eb815bcc88e7dbe521225fac.tar.bz2
Fix a regression in the display of notifications on Windows: the TOPMOST bit needs to be set before the windows get shown (in Init()), otherwise the windows are not displayed topmost.
BUG=35426 TEST=create a notification and focus a window over it Review URL: http://codereview.chromium.org/604020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38814 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/notifications/balloon_view.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc
index 53bb73c..f101669 100644
--- a/chrome/browser/views/notifications/balloon_view.cc
+++ b/chrome/browser/views/notifications/balloon_view.cc
@@ -307,16 +307,16 @@ void BalloonViewImpl::Show(Balloon* balloon) {
html_container_ = Widget::CreatePopupWidget(Widget::NotTransparent,
Widget::AcceptEvents,
Widget::DeleteOnDestroy);
- html_container_->Init(NULL, contents_rect);
html_container_->SetAlwaysOnTop(true);
+ html_container_->Init(NULL, contents_rect);
html_container_->SetContentsView(html_contents_);
gfx::Rect balloon_rect(x(), y(), width(), height());
frame_container_ = Widget::CreatePopupWidget(Widget::Transparent,
Widget::AcceptEvents,
Widget::DeleteOnDestroy);
- frame_container_->Init(NULL, balloon_rect);
frame_container_->SetAlwaysOnTop(true);
+ frame_container_->Init(NULL, balloon_rect);
frame_container_->SetContentsView(this);
close_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_CLOSE));