chrome/test/data/extensions/api_test/notification/galore/app/images/plant3-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/plant3-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/plant3-64x64.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/send-16x16.png » ('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 ?þþ(¢¼Cã§Ç¿üðx³Æ·©¬·öVÁæyRy¯`Ôµ-¶ZÙÙO%Ì¼ndbì¢¼ü×6ËrL#3Í±ð	10 ?þþ(¢¼Cã§Ç¿üðx³Æ·©¬·öVÁæyRy¯`Ôµ-¶ZÙÙO%Ì¼ndbì¢¼ü×6ËrL#3Í±ð

(...skipping 165 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
176 r	176 r

177 yv«áßZT¦ãÂ^!²ÕHÐüY	177 yv«áßZT¦ãÂ^!²ÕHÐüY

178 q¢Û}Jáp4»u4,T°²SteVßÍýÎÍ¯KúwÊ¥>}SåÙÿ^ùú~Òðj_í]¤xÇS»ý>5\|+øà{ÉåÓl þ!ËâxÎÎÖFÝÇö7õm7TI*÷	178 q¢Û}Jáp4»u4,T°²SteVßÍýÎÍ¯KúwÊ¥>}SåÙÿ^ùú~Òðj_í]¤xÇS»ý>5\|+øà{ÉåÓl þ!ËâxÎÎÖFÝÇö7õm7TI*÷

179 qb$Àu´s³ÏüñûW¯Ä	179 qb$Àu´s³ÏüñûW¯Ä

180 &óöñ¿<-à+¨nu+?ºüM«E¥°óYÐìlôUqÇÚ@¿`	180 &óöñ¿<-à+¨nu+?ºüM«E¥°óYÐìlôUqÇÚ@¿`

181 µÉ¿ßÝß>(iWSø)g«>p×Z>¼#ýY":EÁÁ<àÉßÇ¯Å¥ü	181 µÉ¿ßÝß>(iWSø)g«>p×Z>¼#ýY":EÁÁ<àÉßÇ¯Å¥ü

182 ÂCÂÜê¾'Â	182 ÂCÂÜê¾'Â

183 Æ4²¾ÂAøV2Ì²Ç-=¬%ü¾Îo]4³	183 Æ4²¾ÂAøV2Ì²Ç-=¬%ü¾Îo]4³

184 ü·`¥Qäæ\½úÿÃ§ÂÏ¶~ð~aa.á¿ Ùi]ÌSE(AµOÓÑ.ÌKx£2¥ù%Ì¤±úIÓí¬ Ã³Åû·)ªøÃ.GWÙæ¼ãHðßÄjdÆ¾ Óô=1qáG=²ÌrÝGY¸Iä\d2C"DàüËÒ½r!¶;{xÖ(bPÆ U	184 ü·`¥Qäæ\½úÿÃ§ÂÏ¶~ð~aa.á¿ Ùi]ÌSE(AµOÓÑ.ÌKx£2¥ù%Ì¤±úIÓí¬ Ã³Åû·)ªøÃ.GWÙæ¼ãHðßÄjdÆ¾ Óô=1qáG=²ÌrÝGY¸Iä\d2C"DàüËÒ½r!¶;{xÖ(bPÆ U

185 «Uå²8=MÿÛ»¥ëgäTak]ÝÑEeÿÙ	185 «Uå²8=MÿÛ»¥ëgäTak]ÝÑEeÿÙ

OLD	NEW