diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 01:19:06 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-17 01:19:06 +0000 |
| commit | 3b845753b707daca3fe3e733263065f162b7162b (patch) | |
| tree | b674a4d72a118323da1fad83f8caa43f57a86b32 /chrome/browser/cocoa | |
| parent | fee8f0222a5f2a377ba5d7f2d3383481c02eafac (diff) | |
| download | chromium_src-3b845753b707daca3fe3e733263065f162b7162b.zip chromium_src-3b845753b707daca3fe3e733263065f162b7162b.tar.gz chromium_src-3b845753b707daca3fe3e733263065f162b7162b.tar.bz2 | |
* Moved sticky/controls frag to chromeos::BalloonViewImpl
* Added AddSystemNotification to add system notification
and UpdateNotification to update a notification.
* refactored NotificationObjectProxy and added NotificationDelegate class.
* Added notification_browser.cc.
BUG=33306
TEST=added notification_browser.cc with minimal test. I'll add more in next step.
Review URL: http://codereview.chromium.org/1013002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
3 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm index d9f9c8f..7f48b1e 100644 --- a/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm +++ b/chrome/browser/cocoa/notifications/balloon_controller_unittest.mm @@ -8,6 +8,7 @@ #include "chrome/browser/cocoa/notifications/balloon_controller.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" +#include "chrome/browser/notifications/notification.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/test/testing_profile.h" #import "third_party/ocmock/OCMock/OCMock.h" @@ -56,8 +57,7 @@ class BalloonControllerTest : public RenderViewHostTestHarness { TEST_F(BalloonControllerTest, ShowAndCloseTest) { Notification n(GURL("http://www.google.com"), GURL("http://www.google.com"), - L"http://www.google.com", new NotificationObjectProxy(-1, -1, -1, false), - false); + L"http://www.google.com", new NotificationObjectProxy(-1, -1, -1, false)); scoped_ptr<Balloon> balloon( new Balloon(n, profile_.get(), collection_.get())); @@ -75,8 +75,7 @@ TEST_F(BalloonControllerTest, ShowAndCloseTest) { TEST_F(BalloonControllerTest, SizesTest) { Notification n(GURL("http://www.google.com"), GURL("http://www.google.com"), - L"http://www.google.com", new NotificationObjectProxy(-1, -1, -1, false), - false); + L"http://www.google.com", new NotificationObjectProxy(-1, -1, -1, false)); scoped_ptr<Balloon> balloon( new Balloon(n, profile_.get(), collection_.get())); balloon->set_content_size(gfx::Size(100, 100)); diff --git a/chrome/browser/cocoa/notifications/balloon_view_bridge.h b/chrome/browser/cocoa/notifications/balloon_view_bridge.h index b3c552b..5c4b927 100644 --- a/chrome/browser/cocoa/notifications/balloon_view_bridge.h +++ b/chrome/browser/cocoa/notifications/balloon_view_bridge.h @@ -19,6 +19,7 @@ class BalloonViewBridge : public BalloonView { // BalloonView interface. virtual void Show(Balloon* balloon); + virtual void Update() {} virtual void RepositionToBalloon(); virtual void Close(bool by_user); virtual gfx::Size GetSize() const; diff --git a/chrome/browser/cocoa/notifications/balloon_view_host_mac.h b/chrome/browser/cocoa/notifications/balloon_view_host_mac.h index aabbba8..235ab3c 100644 --- a/chrome/browser/cocoa/notifications/balloon_view_host_mac.h +++ b/chrome/browser/cocoa/notifications/balloon_view_host_mac.h @@ -7,6 +7,7 @@ #include "app/gfx/native_widget_types.h" #include "chrome/browser/notifications/balloon.h" +#include "chrome/browser/notifications/notification.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #import "chrome/browser/renderer_host/render_widget_host_view_mac.h" #include "chrome/browser/renderer_host/site_instance.h" |