summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications/balloon_collection_mac.mm
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 17:21:06 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 17:21:06 +0000
commit6054eb39f51d94696f2bd3eeb38e102fffc3ae06 (patch)
tree5b68bf394adada333db59f5e717b6ab7341f0396 /chrome/browser/notifications/balloon_collection_mac.mm
parentb2fe07d168d4cb6395d5e265af9521305c320d92 (diff)
downloadchromium_src-6054eb39f51d94696f2bd3eeb38e102fffc3ae06.zip
chromium_src-6054eb39f51d94696f2bd3eeb38e102fffc3ae06.tar.gz
chromium_src-6054eb39f51d94696f2bd3eeb38e102fffc3ae06.tar.bz2
Desktop Notifications for the mac!
BUG=23066 TEST=notify_demo.html Review URL: http://codereview.chromium.org/548208 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/balloon_collection_mac.mm')
-rw-r--r--chrome/browser/notifications/balloon_collection_mac.mm8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/notifications/balloon_collection_mac.mm b/chrome/browser/notifications/balloon_collection_mac.mm
index 6a652e0..4e8e305 100644
--- a/chrome/browser/notifications/balloon_collection_mac.mm
+++ b/chrome/browser/notifications/balloon_collection_mac.mm
@@ -3,12 +3,16 @@
// found in the LICENSE file.
#include "chrome/browser/notifications/balloon_collection.h"
+#include "chrome/browser/cocoa/notifications/balloon_view_bridge.h"
#include "base/logging.h"
Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification,
Profile* profile) {
- // TODO(johnnyg): http://crbug.com/23066. Hook up to views.
- return new Balloon(notification, profile, this);
+ Balloon* balloon = new Balloon(notification, profile, this);
+ balloon->set_view(new BalloonViewBridge());
+ gfx::Size size(layout_.min_balloon_width(), layout_.min_balloon_height());
+ balloon->set_content_size(size);
+ return balloon;
}