diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 17:37:46 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-25 17:37:46 +0000 |
| commit | 5a7e7bdbedc79a502c37eac1fe6ee22d0bd6dd66 (patch) | |
| tree | f55baaae4e263538a680e6f7be595b82195b10d6 /chrome/browser/notifications | |
| parent | f2fac4cd4fe1f8033c960275a4d2814fa9ef8796 (diff) | |
| download | chromium_src-5a7e7bdbedc79a502c37eac1fe6ee22d0bd6dd66.zip chromium_src-5a7e7bdbedc79a502c37eac1fe6ee22d0bd6dd66.tar.gz chromium_src-5a7e7bdbedc79a502c37eac1fe6ee22d0bd6dd66.tar.bz2 | |
Make sure notifications are only enabled on GTK builds of linux, since that's what's supported so far.
BUG=23954
TEST=none
Review URL: http://codereview.chromium.org/552122
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37017 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
| -rw-r--r-- | chrome/browser/notifications/balloon_collection_linux.cc | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/chrome/browser/notifications/balloon_collection_linux.cc b/chrome/browser/notifications/balloon_collection_linux.cc index bab6895..d787876 100644 --- a/chrome/browser/notifications/balloon_collection_linux.cc +++ b/chrome/browser/notifications/balloon_collection_linux.cc @@ -4,10 +4,22 @@ #include "chrome/browser/notifications/balloon_collection.h" +#include "base/gfx/size.h" #include "base/logging.h" +#include "chrome/browser/notifications/balloon.h" +#include "chrome/browser/views/notifications/balloon_view.h" Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification, Profile* profile) { - // TODO(johnnyg): http://crbug.com/23954. Hook up to views. - return new Balloon(notification, profile, this); + Balloon* balloon = new Balloon(notification, profile, this); + + // TODO(johnnyg): hookup to views code for Chrome OS. +#if defined(TOOLKIT_GTK) + balloon->set_view(new BalloonViewImpl()); + gfx::Size size(layout_.min_balloon_width(), layout_.min_balloon_height()); + balloon->set_content_size(size); +#endif + + return balloon; + } |