chrome/test/data/extensions/api_test/notification/galore/app/images/flower1-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/flower1-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/flower1-64x64.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/flower2-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 ?þþ(¢Ì¨¬ì@U±'É$ö¤ÚI¶ì	10 ?þþ(¢Ì¨¬ì@U±'É$ö¤ÚI¶ì

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
83 5Ïëz	83 5Ïëz

84 ¾¯§_ØHÓ[ë+«'ÚI"Rê fI"Y$	84 ¾¯§_ØHÓ[ë+«'ÚI"Rê fI"Y$

85 äFWAV	85 äFWAV

86 ÏKðÇÿÙkàw&²Ô5ÿøÓPÕäÑ[ÃÖZ7üa¡èË¤G¦¦-lí\|c[ZGZKL	86 ÏKðÇÿÙkàw&²Ô5ÿøÓPÕäÑ[ÃÖZ7üa¡èË¤G¦¦-lí\|c[ZGZKL

87 ´ÛP»înKáìiû0ønú?[ø#W¸×tËM%¡ñ¥á½Ve[i.æk\|!{5Î¥	87 ´ÛP»înKáìiû0ønú?[ø#W¸×tËM%¡ñ¥á½Ve[i.æk\|!{5Î¥

88 \(Íç@S0¿hê´ÍBÂçM	88 \(Íç@S0¿hê´ÍBÂçM

89 +ë9-n"Ô¤¹¿v½9¹$Õð\|HYAW*U@,£má¥[\YáÊDòà´Ò¦½ÑcµVa#í].X7qR6	89 +ë9-n"Ô¤¹¿v½9¹$Õð\|HYAW*U@,£má¥[\YáÊDòà´Ò¦½ÑcµVa#í].X7qR6

90 3nlüä¸G'yL S)só¼='';ósëOãº¿75ï®úªMY§i.º_§]ú/¸ôkÒÔ*QkÕ	90 3nlüä¸G'yL S)só¼='';ósëOãº¿75ï®úªMY§i.º_§]ú/¸ôkÒÔ*QkÕ

91 Q g ü«i~èÿ=y¬ûh$(Ãlsl"	91 Q g ü«i~èÿ=y¬ûh$(Ãlsl"

92 PÌ~ñÀ=MiWÑQEÿÙ	92 PÌ~ñÀ=MiWÑQEÿÙ

OLD	NEW