chrome/test/data/extensions/api_test/notification/galore/app/images/flower4-64x64.jpg - Issue 12313115: Take notification API out of experimental.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/test/data/extensions/api_test/notification/galore/app/images/flower4-64x64.jpg

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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/test/data/extensions/api_test/notification/galore/app/images/flower3-80x80.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/flower4-80x80.jpg » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 ÿØÿàJFIFddÿÛC ÿÛCÿÀ @@"ÿÄ	1 ÿØÿàJFIFddÿÛC ÿÛCÿÀ @@"ÿÄ

2	2

3 ÿÄµ}!1AQa"q2¡#B±ÁRÑð$3br	3 ÿÄµ}!1AQa"q2¡#B±ÁRÑð$3br

4 %&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz	4 %&'()*456789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz

5 ¢£¤¥¦§¨©ª²³´µ¶·¸¹ºÂÃÄÅÆÇÈÉÊÒÓÔÕÖ×ØÙÚáâãäåæçèéêñòóôõö÷øùúÿÄ	5 ¢£¤¥¦§¨©ª²³´µ¶·¸¹ºÂÃÄÅÆÇÈÉÊÒÓÔÕÖ×ØÙÚáâãäåæçèéêñòóôõö÷øùúÿÄ

6	6

7 ÿÄµw!1AQaq"2B¡±Á #3RðbrÑ	7 ÿÄµw!1AQaq"2B¡±Á #3RðbrÑ

8 $4á%ñ&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz	8 $4á%ñ&'()*56789:CDEFGHIJSTUVWXYZcdefghijstuvwxyz

9 ¢£¤¥¦§¨©ª²³´µ¶·¸¹ºÂÃÄÅÆÇÈÉÊÒÓÔÕÖ×ØÙÚâãäåæçèéêòóôõö÷øùúÿÚ	9 ¢£¤¥¦§¨©ª²³´µ¶·¸¹ºÂÃÄÅÆÇÈÉÊÒÓÔÕÖ×ØÙÚâãäåæçèéêòóôõö÷øùúÿÚ

10 ?þþ(¢$<²ºG	10 ?þþ(¢$<²ºG

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
118 wDÔBëNÔÒæÖVhî Ç M	118 wDÔBëNÔÒæÖVhî Ç M

119 ÄQI$]He¿%¾=ÿÁ&¼ñTÔuoøãÄ¾:µÕµÞi	119 ÄQI$]He¿%¾=ÿÁ&¼ñTÔuoøãÄ¾:µÕµÞi

120 £âèug«ÉÙÊéÞ/ÓÄ[ß¹kiY^XåWÉ,<AðÏ3Æçu3,	120 £âèug«ÉÙÊéÞ/ÓÄ[ß¹kiY^XåWÉ,<AðÏ3Æçu3,

121 N¶iN©Õmó¸©%Y7Í¤ÓæoN¯õ^âì¿ X,Ê¼èb(·É>NhÎ:r©4ù¹¼uÑ-z/Çkÿ5_2÷A [ \aõ=#Kº»¸ácmÓÁú\Ì¦-:dds9ÔÞF¶jÉúEÿÊðm×ÃèuÝKSÑ#['Bñ=Æ¤ézÏ o5ÍZ=SÆzÈµÒía[	121 N¶iN©Õmó¸©%Y7Í¤ÓæoN¯õ^âì¿ X,Ê¼èb(·É>NhÎ:r©4ù¹¼uÑ-z/Çkÿ5_2÷A [ \aõ=#Kº»¸ácmÓÁú\Ì¦-:dds9ÔÞF¶jÉúEÿÊðm×ÃèuÝKSÑ#['Bñ=Æ¤ézÏ o5ÍZ=SÆzÈµÒía[

122 :mCIÒV6xÖkÑ ¸bu1«á¯üûÃÿ	122 :mCIÒV6xÖkÑ ¸bu1«á¯üûÃÿ

123 µ{Í{Xñ»ãMfóSµÅÕóËÍzÂ\O4÷W7·ídYï[Î[hR`ë	123 µ{Í{Xñ»ãMfóSµÅÕóËÍzÂ\O4÷W7·ídYï[Î[hR`ë

124 JrøOá´¾òà·µX!$Æ	124 JrøOá´¾òà·µX!$Æ

125 " T	125 " T

126 WOø}Ê³	126 WOø}Ê³

127 >iJ©nP§zÒqqNr²MÆí¥ëi)YX8pÌ%\|2+$¥RkDÓj1M½mfåm/¥õ_FXxÒPÍpX½ÏnGé]z »ò²Ó¾zúó^mg¢ÊªÂÇ®:gÿ]63&1Ç?©Éë_ÐøYËsk±ùMX«»-ÿÙ	127 >iJ©nP§zÒqqNr²MÆí¥ëi)YX8pÌ%\|2+$¥RkDÓj1M½mfåm/¥õ_FXxÒPÍpX½ÏnGé]z »ò²Ó¾zúó^mg¢ÊªÂÇ®:gÿ]63&1Ç?©Éë_ÐøYËsk±ùMX«»-ÿÙ

OLD	NEW