chrome/test/data/extensions/api_test/notification/galore/app/images/plant1-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/plant1-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/man1-80x80.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/plant1-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 ?þþ*µÝª]Æ±¼1l%I-n®-dY#ÉBÍo"ù±äóîñ³E&Vz¦Ä§í3¨þÏ^1±ð'íK5½¼U® ®ðÏãÞ¤=µKkMâ6ó:xÅ1ÜËK~	10 ?þþ*µÝª]Æ±¼1l%I-n®-dY#ÉBÍo"ù±äóîñ³E&Vz¦Ä§í3¨þÏ^1±ð'íK5½¼U® ®ðÏãÞ¤=µKkMâ6ó:xÅ1ÜËK~

(...skipping 35 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
46 ý	46 ý

47 þxRûþ	47 þxRûþ

48 ûoxc×õ+¯Þný½¯ÞO~\|Qãþ;ñ5mÒà46qéÐÙ6ekl(c®Ø½ÜÅ¡ý±ø}ðÇÃ?	48 ûoxc×õ+¯Þný½¯ÞO~\|Qãþ;ñ5mÒà46qéÐÙ6ekl(c®Ø½ÜÅ¡ý±ø}ðÇÃ?

49 ÿá*Â©ykaâ¿ßx®çLòâæËOÔµ4ß&Äö;F HSlPD±[Á	49 ÿá*Â©ykaâ¿ßx®çLòâæËOÔµ4ß&Äö;F HSlPD±[Á

50 pAÏ<1ðóýUÄæÜãG*Í±8ç_ohçJ4±vWIPt¢©ÆJ^Óßj2_'G$Äe5£Nºt¥(s:nÍrÕµjrÑ%Í%7&ÕR K^Tw6²É'Úc_6×/ÊÈQgÇé$yûà,Â6aÁÀÀ·EûèQ@~ÿÁat½/Uñ§ìM	50 pAÏ<1ðóýUÄæÜãG*Í±8ç_ohçJ4±vWIPt¢©ÆJ^Óßj2_'G$Äe5£Nºt¥(s:nÍrÕµjrÑ%Í%7&ÕR K^Tw6²É'Úc_6×/ÊÈQgÇé$yûà,Â6aÁÀÀ·EûèQ@~ÿÁat½/Uñ§ìM

51 ¥Rµ¯ÄoßÚùÐÆÑÁ-®¥ð¬ý¤O"þåÃ:&2Çq&å`¼~àWð½ÿÒÿ¬\|Nøeûlxàþ	51 ¥Rµ¯ÄoßÚùÐÆÑÁ-®¥ð¬ý¤O"þåÃ:&2Çq&å`¼~àWð½ÿÒÿ¬\|Nøeûlxàþ

52 h>Ñÿfå´ñ?Á-[Ã_Û^ Ö\|mü7á[øÇ7wo¥ö¥,V0yñÅÍÅÛ´9ù2Áãñü7árÚÄc*<?,i« ÊÑÄÑQM¶ìÍeÀ8	52 h>Ñÿfå´ñ?Á-[Ã_Û^ Ö\|mü7á[øÇ7wo¥ö¥,V0yñÅÍÅÛ´9ù2Áãñü7árÚÄc*<?,i« ÊÑÄÑQM¶ìÍeÀ8

53 ²ì^aB9ÔW6µ8«½Ü§8¤®çô?ÿÞ¸]ý¨¿à§>&Ø~Òøk{&k¿4¶)!>KÜP(øÛ ìðo¿ü+ãÏÇßÛ;Ä?<ðÿWðçÇKÏ	53 ²ì^aB9ÔW6µ8«½Ü§8¤®çô?ÿÞ¸]ý¨¿à§>&Ø~Òøk{&k¿4¶)!>KÜP(øÛ ìðo¿ü+ãÏÇßÛ;Ä?<ðÿWðçÇKÏ

54 ¾?øÒþËÄ:/´Ã§ëÚÜøaÔ^×ûüE©¥¹´¾µvQË¸·[v/ýÁ×¥áq8L¶1t]	54 ¾?øÒþËÄ:/´Ã§ëÚÜøaÔ^×ûüE©¥¹´¾µvQË¸·[v/ýÁ×¥áq8L¶1t]

55 Õ'^£§^¬·gÄÕðøâ½L%h×ÃªxhFQw_»ÃR¦Õü¥¿-(¯TðÿÙ	55 Õ'^£§^¬·gÄÕðøâ½L%h×ÃªxhFQw_»ÃR¦Õü¥¿-(¯TðÿÙ

OLD	NEW