diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 20:09:01 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-09 20:09:01 +0000 |
| commit | 21351f3d53b1764783de97b4f8927bcc819edb8a (patch) | |
| tree | 4d0c2fcb423d75de938cd3ec548aa8cd9dd9d56f /chrome/browser/notifications | |
| parent | ea7c380758e8825f45ea6c803326e5954fb1cb6c (diff) | |
| download | chromium_src-21351f3d53b1764783de97b4f8927bcc819edb8a.zip chromium_src-21351f3d53b1764783de97b4f8927bcc819edb8a.tar.gz chromium_src-21351f3d53b1764783de97b4f8927bcc819edb8a.tar.bz2 | |
Revert 38469 - Desktop Notifications for the mac!
BUG=23066
TEST=notify_demo.html
Review URL: http://codereview.chromium.org/548208
TBR=johnnyg@chromium.org
Review URL: http://codereview.chromium.org/600015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38493 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications')
| -rw-r--r-- | chrome/browser/notifications/balloon_collection.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/notifications/balloon_collection_mac.mm | 8 |
2 files changed, 2 insertions, 12 deletions
diff --git a/chrome/browser/notifications/balloon_collection.cc b/chrome/browser/notifications/balloon_collection.cc index 58b0f31..224e7bb 100644 --- a/chrome/browser/notifications/balloon_collection.cc +++ b/chrome/browser/notifications/balloon_collection.cc @@ -29,15 +29,9 @@ const int kInterBalloonMargin = 5; } // namespace // static -#if defined(OS_MACOSX) -BalloonCollectionImpl::Layout::Placement - BalloonCollectionImpl::Layout::placement_ = - Layout::VERTICALLY_FROM_TOP_RIGHT; -#else BalloonCollectionImpl::Layout::Placement BalloonCollectionImpl::Layout::placement_ = Layout::VERTICALLY_FROM_BOTTOM_RIGHT; -#endif BalloonCollectionImpl::BalloonCollectionImpl() : space_change_listener_(NULL) { diff --git a/chrome/browser/notifications/balloon_collection_mac.mm b/chrome/browser/notifications/balloon_collection_mac.mm index 4e8e305..6a652e0 100644 --- a/chrome/browser/notifications/balloon_collection_mac.mm +++ b/chrome/browser/notifications/balloon_collection_mac.mm @@ -3,16 +3,12 @@ // 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) { - 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; + // TODO(johnnyg): http://crbug.com/23066. Hook up to views. + return new Balloon(notification, profile, this); } |