Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4548)

Unified Diff: chrome/test/data/extensions/api_test/notifications/galore/app/model.js

Issue 12313115: Take notification API out of experimental. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflict. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/data/extensions/api_test/notifications/galore/app/model.js
diff --git a/chrome/test/data/extensions/api_test/notification/galore/app/model.js b/chrome/test/data/extensions/api_test/notifications/galore/app/model.js
similarity index 94%
rename from chrome/test/data/extensions/api_test/notification/galore/app/model.js
rename to chrome/test/data/extensions/api_test/notifications/galore/app/model.js
index 2c07f027610ae92b33d7422d6016210bb4888c1c..bc33bdb954ffbeee8384b0fa9fe4ac6a55865266 100644
--- a/chrome/test/data/extensions/api_test/notification/galore/app/model.js
+++ b/chrome/test/data/extensions/api_test/notifications/galore/app/model.js
@@ -40,8 +40,8 @@ Galore.NOTIFICATIONS = [
title: 'Althe Frazon',
message: 'Lorem ipsum',
buttons: [
- {title: 'Call', iconUrl: '$@/images/call-16x16.jpg'},
- {title: 'Send Email', iconUrl: '$@/images/send-16x16.jpg'},
+ {title: 'Call', iconUrl: '$@/images/call-16x16.png'},
+ {title: 'Send Email', iconUrl: '$@/images/send-16x16.png'},
]
},
{
@@ -105,29 +105,25 @@ Galore.NOTIFICATIONS = [
iconUrl: '$@/images/flower1-$%x$%.jpg',
title: 'Notification #$#: Daffodils!',
message: 'Narcissus',
- imageUrl: '$@/images/image1-300x225.jpg',
- buttons: [
- {title: 'Lorem Ipsum Dolor Sit Amet Consectetur Adipisicing'},
- {title: 'Elit Sed Do'},
- ]
+ imageUrl: '$@/images/Image1-300x225.jpg'
},
{
iconUrl: '$@/images/flower2-$%x$%.jpg',
title: 'Notification #$#: Sunflowers!',
message: 'Helianthus annuus',
- imageUrl: '$@/images/image2-300x225.jpg'
+ imageUrl: '$@/images/Image2-300x225.jpg'
},
{
iconUrl: '$@/images/flower3-$%x$%.jpg',
title: 'Notification #$#: Poinsettias!',
message: 'Euphorbia pulcherrima',
- imageUrl: '$@/images/image3-300x172.jpg'
+ imageUrl: '$@/images/Image3-300x172.jpg'
},
{
iconUrl: '$@/images/flower4-$%x$%.jpg',
title: 'Notification #$#: Heather!',
message: 'Calluna vulgaris',
- imageUrl: '$@/images/image4-200x300.jpg'
+ imageUrl: '$@/images/Image4-200x300.jpg'
}
]
},

Powered by Google App Engine
This is Rietveld 408576698