chrome/test/data/extensions/api_test/notification/galore/app/images/fruit3-80x80.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/fruit3-80x80.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/fruit3-64x64.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/fruit4-64x64.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ÿÀ PP"ÿÄ	1 ÿØÿàJFIFddÿÛC ÿÛCÿÀ PP"ÿÄ

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 ?þþ(¢(¢(¢(¢(¢d$Q¼²:G	10 ?þþ(¢(¢(¢(¢(¢d$Q¼²:G

(...skipping 96 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
107 &ÉÚ=ñ©qÈVåé_ ÿ¿g?xcPðæ«£x8ØÜø^IæÐP^jÓZiso%¼e³¹½x£_-ßh¶@`	107 &ÉÚ=ñ©qÈVåé_ ÿ¿g?xcPðæ«£x8ØÜø^IæÐP^jÓZiso%¼e³¹½x£_-ßh¶@`

108 }k¡k&#	108 }k¡k&#

109 áûd<cËvä}§¯{&q£Üªìãùæáy¯ö%ð·	109 áûd<cËvä}§¯{&q£Üªìãùæáy¯ö%ð·

110 0ÔrøUÈ08µJèsàðïÙK	110 0ÔrøUÈ08µJèsàðïÙK

111 8TÃÊàý£R©IÆÎ£FÎ)À	111 8TÃÊàý£R©IÆÎ£FÎ)À

112 Kâ>y«ÇWÃýcM*õ-%R<Ms.nxÊQþ$Úz;	112 Kâ>y«ÇWÃýcM*õ-%R<Ms.nxÊQþ$Úz;

113 ÃEWëÇáM1£}äCõP{c¸ô§QIÆ/t7º©!QÑôËøØa£»±¶¸BPRhØ^yª\|ø'¿ÂOÚ¿öÿxfów 9ÉûFÙ9¯Y¢¸«åv+ýçGþ:pæÙG0Çáõ\|ujþJþ$xM§ìÇû?éÒùÚgÂºT·oÒü'¢éÄ	113 ÃEWëÇáM1£}äCõP{c¸ô§QIÆ/t7º©!QÑôËøØa£»±¶¸BPRhØ^yª\|ø'¿ÂOÚ¿öÿxfów 9ÉûFÙ9¯Y¢¸«åv+ýçGþ:pæÙG0Çáõ\|ujþJþ$xM§ìÇû?éÒùÚgÂºT·oÒü'¢éÄ

114 ØVh=½k´´øWà+ eá½2Õ`,6Ñ ðèTR£å¸}0ø	114 ØVh=½k´´øWà+ eá½2Õ`,6Ñ ðèTR£å¸}0ø

115 TÃN1ü6«fÕÕ«fuë/ïÕ¿93Á	115 TÃN1ü6«fÕÕ«fuë/ïÕ¿93Á

116 æ-:Ý0r6 úõ~-M*ÝüëjîPVQ^«ÖÅUËÕßó?ÿÙ	116 æ-:Ý0r6 úõ~-M*ÝüëjîPVQ^«ÖÅUËÕßó?ÿÙ

OLD	NEW