summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa
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/cocoa
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/cocoa')
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.h1
-rw-r--r--chrome/browser/cocoa/browser_window_cocoa.mm4
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/cocoa/browser_window_cocoa.h b/chrome/browser/cocoa/browser_window_cocoa.h
index d4b3ffb..f3f7056 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/cocoa/browser_window_cocoa.h
@@ -25,6 +25,7 @@ class BrowserWindowCocoa : public BrowserWindow {
virtual void SetBounds(const gfx::Rect& bounds);
virtual void Close();
virtual void Activate();
+ virtual bool IsActive() const;
virtual void FlashFrame();
virtual void* GetNativeHandle();
virtual BrowserWindowTesting* GetBrowserWindowTesting();
diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm
index 9334671..aca8d78 100644
--- a/chrome/browser/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/cocoa/browser_window_cocoa.mm
@@ -48,6 +48,10 @@ void BrowserWindowCocoa::FlashFrame() {
requestUserAttention:NSInformationalRequest];
}
+bool BrowserWindowCocoa::IsActive() const {
+ return [window_ isKeyWindow];
+}
+
void* BrowserWindowCocoa::GetNativeHandle() {
return [controller_ window];
}