chrome/test/data/extensions/api_test/notification/galore/app/images/fruit4-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/fruit4-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/fruit4-64x64.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/fruit5-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 ÿØÿàJFIFHHÿÛC ÿÛCÿÀ PP"ÿÄ	1 ÿØÿàJFIFHHÿÛ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 ?þþ(¢)¥ÑNÖ`Òø'*¹ì23éiÄàzM~EÿÁFÿooÙá<Ià}kâç4þkÚußÂ[í mG@Ô4á EñÝÌÑióéZ®ú}dÒ\\¤7òË¼zµ±ùÙ¦cC+ÁÕÅÖ©¸'ËÔ5R]!KNil¯¥Ú½Ùìä\|9ñ>3 û;2lNyQst°ÔgVjÞrPO+¬¥hÝ¥{´~¡ÜüDð	10 ?þþ(¢)¥ÑNÖ`Òø'*¹ì23éiÄàzM~EÿÁFÿooÙá<Ià}kâç4þkÚußÂ[í mG@Ô4á EñÝÌÑióéZ®ú}dÒ\\¤7òË¼zµ±ùÙ¦cC+ÁÕÅÖ©¸'ËÔ5R]!KNil¯¥Ú½Ùìä\|9ñ>3 û;2lNyQst°ÔgVjÞrPO+¬¥hÝ¥{´~¡ÜüDð

(...skipping 141 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 ".ô(® xäHÝ~ñgü{á	152 ".ô(® xäHÝ~ñgü{á

153 ü	153 ü

154 ~4øÏÀ¾	154 ~4øÏÀ¾

155 \±×_BÖ\|=aã+ûIl®onÃLñö¾ÖÚVÛécX¥¶ÊGO4ò þôQ_§â8	155 \±×_BÖ\|=aã+ûIl®onÃLñö¾ÖÚVÛécX¥¶ÊGO4ò þôQ_§â8

156 1ÙfYæ9-	156 1ÙfYæ9-

157 Ã Q§B¶áN"ôË]lÛmYü} übÈ8¸¸óÃxþ7Çâ3	157 Ã Q§B¶áN"ôË]lÛmYü} übÈ8¸¸óÃxþ7Çâ3

158 Æ´¡¯ÄVyÍáçÏJñ¹i·(Â1,R?\|ÿ>ø=áÝGH¾Õ¾;ügÕ¡Ñuéuû;=5<!¡w%´vè	158 Æ´¡¯ÄVyÍáçÏJñ¹i·(Â1,R?\|ÿ>ø=áÝGH¾Õ¾;ügÕ¡Ñuéuû;=5<!¡w%´vè

159 Ãèw±$;ÔÊ¨©42ûïà/ì	159 Ãèw±$;ÔÊ¨©42ûïà/ì

160 û,þÍø»økð¯F_´ñÝOã/\|Yâénâ¢0kãLtÚò~îÁ- W+9úþÓ)àÈªÇpÞÃR!í#¢^ìÚr ÒIÙøÿã_	160 û,þÍø»økð¯F_´ñÝOã/\|Yâénâ¢0kãLtÚò~îÁ- W+9úþÓ)àÈªÇpÞÃR!í#¢^ìÚr ÒIÙøÿã_

161 `«åWânoå¸´l<±s¥®¥4«Ñ¡ì©VQç(ª±¥&mp ¢+êOÈÿÙ	161 `«åWânoå¸´l<±s¥®¥4«Ñ¡ì©VQç(ª±¥&mp ¢+êOÈÿÙ

OLD	NEW