Side by Side Diff: chrome/test/data/extensions/api_test/notifications/galore/assets/Plant1.jpg
Issue 12313115 :
Take notification API out of experimental. (Closed)
Patch Set: Fix merge conflict.
Use n/p to move between diff chunks;
N/P to move between comments.
Draft comments are only viewable by you.
Jump to:
chrome/browser/extensions/api/notification/notification_api.h
chrome/browser/extensions/api/notification/notification_api.cc
chrome/browser/extensions/api/notification/notification_apitest.cc
chrome/browser/extensions/api/notifications/notifications_api.h
chrome/browser/extensions/api/notifications/notifications_api.cc
chrome/browser/extensions/api/notifications/notifications_api_unittest.cc
chrome/browser/extensions/api/notifications/notifications_apitest.cc
chrome/browser/extensions/event_names.cc
chrome/browser/extensions/extension_function_histogram_value.h
chrome/browser/notifications/message_center_settings_controller.cc
chrome/browser/resources/google_now/background.js
chrome/chrome_browser_extensions.gypi
chrome/chrome_renderer.gypi
chrome/chrome_tests.gypi
chrome/chrome_tests_unit.gypi
chrome/common/extensions/api/_permission_features.json
chrome/common/extensions/api/api.gyp
chrome/common/extensions/api/experimental_notification.idl
chrome/common/extensions/api/notifications.idl
chrome/common/extensions/docs/templates/intros/experimental_notification.html
chrome/common/extensions/docs/templates/intros/notifications.html
chrome/common/extensions/docs/templates/public/apps/experimental_notification.html
chrome/common/extensions/docs/templates/public/apps/notifications.html
chrome/renderer/extensions/dispatcher.cc
chrome/renderer/resources/extensions/notification_custom_bindings.js
chrome/renderer/resources/extensions/notifications_custom_bindings.js
chrome/renderer/resources/renderer_resources.grd
chrome/test/data/extensions/api_test/notification/api/by_user/background.js
chrome/test/data/extensions/api_test/notification/api/by_user/manifest.json
chrome/test/data/extensions/api_test/notification/api/csp/background.js
chrome/test/data/extensions/api_test/notification/api/csp/manifest.json
chrome/test/data/extensions/api_test/notification/api/events/background.js
chrome/test/data/extensions/api_test/notification/api/events/icon.png
chrome/test/data/extensions/api_test/notification/api/events/manifest.json
chrome/test/data/extensions/api_test/notification/galore/app/controller.js
chrome/test/data/extensions/api_test/notification/galore/app/images/Image1-300x225.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/Image2-300x225.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/Image3-300x172.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/Image4-200x300.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/call-16x16.png
chrome/test/data/extensions/api_test/notification/galore/app/images/close-26x26.png
chrome/test/data/extensions/api_test/notification/galore/app/images/flower1-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/flower1-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/flower2-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/flower2-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/flower3-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/flower3-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/flower4-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/flower4-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit1-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit1-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit2-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit2-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit3-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit3-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit4-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit4-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit5-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit5-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit6-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/fruit6-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/icon-128x128.png
chrome/test/data/extensions/api_test/notification/galore/app/images/icon-16x16.png
chrome/test/data/extensions/api_test/notification/galore/app/images/icon-48x48.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-00-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-00-80x80.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-01-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-01-80x80.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-02-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-02-80x80.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-03-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-03-80x80.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-05-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-05-80x80.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-08-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-08-80x80.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-13-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/inbox-13-80x80.png
chrome/test/data/extensions/api_test/notification/galore/app/images/man1-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/man1-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/plant1-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/plant1-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/plant2-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/plant2-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/plant3-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/plant3-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/send-16x16.png
chrome/test/data/extensions/api_test/notification/galore/app/images/tahoe-300x225.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/white-64x64.png
chrome/test/data/extensions/api_test/notification/galore/app/images/woman1-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/woman1-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/woman2-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/woman2-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/woman3-64x64.jpg
chrome/test/data/extensions/api_test/notification/galore/app/images/woman3-80x80.jpg
chrome/test/data/extensions/api_test/notification/galore/app/main.js
chrome/test/data/extensions/api_test/notification/galore/app/manifest.json
chrome/test/data/extensions/api_test/notification/galore/app/model.js
chrome/test/data/extensions/api_test/notification/galore/app/style.css
chrome/test/data/extensions/api_test/notification/galore/app/view.js
chrome/test/data/extensions/api_test/notification/galore/app/window.html
chrome/test/data/extensions/api_test/notification/galore/assets/Credits.txt
chrome/test/data/extensions/api_test/notification/galore/assets/Flower1.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Flower2.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Flower3.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Flower4.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Fruit1.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Fruit2.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Fruit3.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Fruit4.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Fruit5.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Fruit6.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Image1.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Image2.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Image3.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Image4.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Man1.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Notifications.key
chrome/test/data/extensions/api_test/notification/galore/assets/Notifications.png
chrome/test/data/extensions/api_test/notification/galore/assets/Plant1.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Plant2.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Plant3.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Promotional-1x.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Promotional-2x.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Screenshot.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Tahoe.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Woman1.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Woman2.jpg
chrome/test/data/extensions/api_test/notification/galore/assets/Woman3.jpg
chrome/test/data/extensions/api_test/notifications/api/by_user/background.js
chrome/test/data/extensions/api_test/notifications/api/by_user/manifest.json
chrome/test/data/extensions/api_test/notifications/api/csp/background.js
chrome/test/data/extensions/api_test/notifications/api/csp/manifest.json
chrome/test/data/extensions/api_test/notifications/api/events/background.js
chrome/test/data/extensions/api_test/notifications/api/events/icon.png
chrome/test/data/extensions/api_test/notifications/api/events/manifest.json
chrome/test/data/extensions/api_test/notifications/galore/app/controller.js
chrome/test/data/extensions/api_test/notifications/galore/app/images/Image1-300x225.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/Image2-300x225.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/Image3-300x172.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/Image4-200x300.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/call-16x16.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/close-26x26.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower1-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower1-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower2-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower2-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower3-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower3-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower4-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/flower4-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit1-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit1-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit2-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit2-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit3-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit3-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit4-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit4-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit5-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit5-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit6-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/fruit6-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/icon-128x128.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/icon-16x16.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/icon-48x48.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-00-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-00-80x80.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-01-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-01-80x80.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-02-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-02-80x80.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-03-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-03-80x80.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-05-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-05-80x80.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-08-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-08-80x80.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-13-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/inbox-13-80x80.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/man1-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/man1-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/plant1-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/plant1-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/plant2-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/plant2-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/plant3-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/plant3-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/send-16x16.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/tahoe-300x225.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/white-64x64.png
chrome/test/data/extensions/api_test/notifications/galore/app/images/woman1-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/woman1-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/woman2-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/woman2-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/woman3-64x64.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/images/woman3-80x80.jpg
chrome/test/data/extensions/api_test/notifications/galore/app/main.js
chrome/test/data/extensions/api_test/notifications/galore/app/manifest.json
chrome/test/data/extensions/api_test/notifications/galore/app/model.js
chrome/test/data/extensions/api_test/notifications/galore/app/style.css
chrome/test/data/extensions/api_test/notifications/galore/app/view.js
chrome/test/data/extensions/api_test/notifications/galore/app/window.html
chrome/test/data/extensions/api_test/notifications/galore/assets/Credits.txt
chrome/test/data/extensions/api_test/notifications/galore/assets/Flower1.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Flower2.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Flower3.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Flower4.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Fruit1.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Fruit2.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Fruit3.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Fruit4.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Fruit5.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Fruit6.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Image1.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Image2.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Image3.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Image4.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Man1.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Notifications.key
chrome/test/data/extensions/api_test/notifications/galore/assets/Notifications.png
chrome/test/data/extensions/api_test/notifications/galore/assets/Plant1.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Plant2.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Plant3.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Promotional-1x.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Promotional-2x.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Screenshot.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Tahoe.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Woman1.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Woman2.jpg
chrome/test/data/extensions/api_test/notifications/galore/assets/Woman3.jpg