diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 18:20:22 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 18:20:22 +0000 |
| commit | 65b12342acf69cc589a8e3f96ec86f08a25018ee (patch) | |
| tree | 71b30e91270cc26df847a32c3db473c12fe98cbd /chrome/browser | |
| parent | 7c71e94b9702df4cb7eec1ae4920847a4269674f (diff) | |
| download | chromium_src-65b12342acf69cc589a8e3f96ec86f08a25018ee.zip chromium_src-65b12342acf69cc589a8e3f96ec86f08a25018ee.tar.gz chromium_src-65b12342acf69cc589a8e3f96ec86f08a25018ee.tar.bz2 | |
Use DesktopNotificationService::CreateDataUrl for notification without link.
I also changed the test to make the cause of failure clear.
TBR=chocobo@chromium.org
BUG=59195
TEST=TestActivateDeactivate will pass
Review URL: http://codereview.chromium.org/3796005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chromeos/notifications/notification_browsertest.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/chromeos/notifications/system_notification_factory.cc | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/notifications/notification_browsertest.cc b/chrome/browser/chromeos/notifications/notification_browsertest.cc index 5b5bab30..5901454 100644 --- a/chrome/browser/chromeos/notifications/notification_browsertest.cc +++ b/chrome/browser/chromeos/notifications/notification_browsertest.cc @@ -504,8 +504,7 @@ IN_PROC_BROWSER_TEST_F(NotificationTest, FLAKY_TestScrollBalloonToVisible) { } } -// Fails intermittently on ChromiumOS. http://crbug.com/59195 -IN_PROC_BROWSER_TEST_F(NotificationTest, FLAKY_TestActivateDeactivate) { +IN_PROC_BROWSER_TEST_F(NotificationTest, TestActivateDeactivate) { BalloonCollectionImpl* collection = GetBalloonCollectionImpl(); NotificationPanel* panel = GetNotificationPanel(); NotificationPanelTester* tester = panel->GetTester(); @@ -523,6 +522,7 @@ IN_PROC_BROWSER_TEST_F(NotificationTest, FLAKY_TestActivateDeactivate) { // Wait until all renderers get size. WaitForResize(view1); WaitForResize(view2); + EXPECT_LT(view2->size().height(), 50) << "view size is bigger than expected"; panel->OnMouseMotion(gfx::Point(10, 50)); EXPECT_TRUE(tester->IsActive(view1)); diff --git a/chrome/browser/chromeos/notifications/system_notification_factory.cc b/chrome/browser/chromeos/notifications/system_notification_factory.cc index 65ea497..ab7568c 100644 --- a/chrome/browser/chromeos/notifications/system_notification_factory.cc +++ b/chrome/browser/chromeos/notifications/system_notification_factory.cc @@ -18,7 +18,10 @@ Notification SystemNotificationFactory::Create( const GURL& icon, const string16& title, const string16& text, NotificationDelegate* delegate) { - return Create(icon, title, text, string16(), delegate); + string16 content_url = DesktopNotificationService::CreateDataUrl( + icon, title, text, WebKit::WebTextDirectionDefault); + return Notification(GURL(), GURL(content_url), string16(), string16(), + delegate); } // static |