chrome/test/data/extensions/api_test/notification/galore/app/images/flower3-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/flower3-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/flower3-64x64.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/flower4-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 ?þþ(®nÏÅº	10 ?þþ(®nÏÅº

(...skipping 179 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
190 µÿ8x7ÅGÅÖ²M/ëíVº_>(\|cñï	190 µÿ8x7ÅGÅÖ²M/ëíVº_>(\|cñï

191 ís#HöÍá_ü@ºÓõ[6-P·¼VQµ²¥úbáj3¢¥µûÚ·âz2²i.ý¾Góuÿ³ÿxüUý·¿`ÿüa´Õu ñîã³ü'ÅÍ2é¼7£iaµÝ3N×oÔ¼å5sµ	191 ís#HöÍá_ü@ºÓõ[6-P·¼VQµ²¥úbáj3¢¥µûÚ·âz2²i.ý¾Góuÿ³ÿxüUý·¿`ÿüa´Õu ñîã³ü'ÅÍ2é¼7£iaµÝ3N×oÔ¼å5sµ

192 ëÉ%ÝZ\ØÊñùfk?íCþ ùà+Ï±×ÀêUöèþøHtRÈéÚ¯µ[Q×oìÜæ=Vîí7'Ëõ¯ ¥üà\|<Ðt	192 ëÉ%ÝZ\ØÊñùfk?íCþ ùà+Ï±×ÀêUöèþøHtRÈéÚ¯µ[Q×oìÜæ=Vîí7'Ëõ¯ ¥üà\|<Ðt

193 ø+Ã7<7 éÖF è:e£hú])me§ize1Ãac	193 ø+Ã7<7 éÖF è:e£hú])me§ize1Ãac

194 ¼hE$q¢U	194 ¼hE$q¢U

195 ìkà²þ	195 ìkà²þ

196 É²Î&Åñ>_	196 É²Î&Åñ>_

197 ¡RZTâ6ç:3u#eNRt´QV©+MÚ\î~.2\|¿<Ågø	197 ¡RZTâ6ç:3u#eNRt´QV©+MÚ\î~.2\|¿<Ågø

198 :Ãc1Ô}e£	198 :Ãc1Ô}e£

199 öHÎñ´Òw»\×l¢+ëÏ\|ÿÙ	199 öHÎñ´Òw»\×l¢+ëÏ\|ÿÙ

OLD	NEW