diff options
| author | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 00:30:05 +0000 |
|---|---|---|
| committer | johnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-06 00:30:05 +0000 |
| commit | b0b2a3dd01962592fc8c1f981415ab2bdb8edefb (patch) | |
| tree | 6cbda13db92837ae9aadd32a9c4aa6c87aaaf38a /chrome/browser/chromeos/notifications | |
| parent | e5ce23e294561b52d35b72eb30c8f5ae869e0fe2 (diff) | |
| download | chromium_src-b0b2a3dd01962592fc8c1f981415ab2bdb8edefb.zip chromium_src-b0b2a3dd01962592fc8c1f981415ab2bdb8edefb.tar.gz chromium_src-b0b2a3dd01962592fc8c1f981415ab2bdb8edefb.tar.bz2 | |
Allow the user to choose which corner of the screen should get notifications.
BUG=none
TEST=create notifications, use the options menu
Review URL: http://codereview.chromium.org/6006007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/notifications')
| -rw-r--r-- | chrome/browser/chromeos/notifications/balloon_collection_impl.h | 1 | ||||
| -rw-r--r-- | chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.h b/chrome/browser/chromeos/notifications/balloon_collection_impl.h index 03496df..320bfd6 100644 --- a/chrome/browser/chromeos/notifications/balloon_collection_impl.h +++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.h @@ -66,6 +66,7 @@ class BalloonCollectionImpl : public BalloonCollection, virtual void RemoveAll(); virtual bool HasSpace() const; virtual void ResizeBalloon(Balloon* balloon, const gfx::Size& size); + virtual void SetPositionPreference(PositionPreference position) {} virtual void DisplayChanged() {} virtual void OnBalloonClosed(Balloon* source); virtual const Balloons& GetActiveBalloons() { return base_.balloons(); } diff --git a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc index 377828b..9a77680 100644 --- a/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/chromeos/notifications/desktop_notifications_unittest.cc @@ -7,6 +7,7 @@ #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/common/render_messages_params.h" +#include "chrome/test/testing_pref_service.h" namespace chromeos { @@ -77,7 +78,8 @@ DesktopNotificationsTest::~DesktopNotificationsTest() { void DesktopNotificationsTest::SetUp() { profile_.reset(new TestingProfile()); balloon_collection_ = new MockBalloonCollection(); - ui_manager_.reset(new NotificationUIManager()); + ui_manager_.reset( + new NotificationUIManager(profile_->GetTestingPrefService())); ui_manager_->Initialize(balloon_collection_); balloon_collection_->set_space_change_listener(ui_manager_.get()); service_.reset(new DesktopNotificationService(profile(), ui_manager_.get())); @@ -86,8 +88,8 @@ void DesktopNotificationsTest::SetUp() { void DesktopNotificationsTest::TearDown() { service_.reset(NULL); - profile_.reset(NULL); ui_manager_.reset(NULL); + profile_.reset(NULL); } ViewHostMsg_ShowNotification_Params |