summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/info_bubble.cc
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 00:41:27 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 00:41:27 +0000
commit5f2731c58384eb8b4b5102865dedbe9ade800d8a (patch)
tree77b8ff1862e478f7a22931c97047653a5cff90e0 /chrome/browser/views/info_bubble.cc
parent4829cfadb745f47c441c709475e5f33a2b26d831 (diff)
downloadchromium_src-5f2731c58384eb8b4b5102865dedbe9ade800d8a.zip
chromium_src-5f2731c58384eb8b4b5102865dedbe9ade800d8a.tar.gz
chromium_src-5f2731c58384eb8b4b5102865dedbe9ade800d8a.tar.bz2
Does two changes to appease chrome bot runs:
. Changes InfoBubble to properly initialize all fields in member initializer list and set the delegate before show on the off chance the bubble is deleted from show. This should no longer happen after the second change. . Only show the bookmark bubble if the browser window is active. I experimented with conditionally enabling the star and this turns out to be a bit error prone. BUG=none TEST=none Review URL: http://codereview.chromium.org/31016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/info_bubble.cc')
-rw-r--r--chrome/browser/views/info_bubble.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc
index 042d908..3ab8ec0 100644
--- a/chrome/browser/views/info_bubble.cc
+++ b/chrome/browser/views/info_bubble.cc
@@ -73,12 +73,18 @@ InfoBubble* InfoBubble::Show(HWND parent_hwnd,
InfoBubble* window = new InfoBubble();
DLOG(WARNING) << "new bubble=" << window;
window->Init(parent_hwnd, position_relative_to, content);
- window->ShowWindow(SW_SHOW);
+ // Set the delegate before we show, on the off chance the delegate is needed
+ // during showing.
window->delegate_ = delegate;
+ window->ShowWindow(SW_SHOW);
return window;
}
-InfoBubble::InfoBubble() : content_view_(NULL), closed_(false) {
+InfoBubble::InfoBubble()
+ : delegate_(NULL),
+ parent_(NULL),
+ content_view_(NULL),
+ closed_(false) {
}
InfoBubble::~InfoBubble() {