chrome/test/data/extensions/api_test/notification/galore/app/images/flower4-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/flower4-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/flower4-64x64.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/fruit1-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 ?þþ(¢¥ü·0Y]Ïgl/o!¶[K6mVîæ8à¶k§FË$¡PÈUÜAÆÝ~KÁcm]OöEý<KsðÂ?ø I>:\|añ.ð#á	10 ?þþ(¢¥ü·0Y]Ïgl/o!¶[K6mVîæ8à¶k§FË$¡PÈUÜAÆÝ~KÁcm]OöEý<KsðÂ?ø I>:\|añ.ð#á

(...skipping 127 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
138 UÌ/ý\|[ÿYþÍÿµ3¬Aá¶ðíó^G}#è¶Ú	138 UÌ/ý\|[ÿYþÍÿµ3¬Aá¶ðíó^G}#è¶Ú

139 Ëq4&C¹_Ñ¯RXã2¾Å*ÀW	139 Ëq4&C¹_Ñ¯RXã2¾Å*ÀW

140 áOø&¯Áo÷Ïcá«´k³=öÏ	140 áOø&¯Áo÷Ïcá«´k³=öÏ

141 ÊÞ$ãÃ±ôØ§HÍ	141 ÊÞ$ãÃ±ôØ§HÍ

142 :»q_á¼&âV4ñX=*Ië(ºvÓh:p×Öim¥´?P«Ç9$¡)áéW«)m{8%þ))Múû¯ï?8¿fßï\|GáøNÓü) éºnô»N¾.×-¯ôýCGOê7zr¾§ccgaoÐÆím<×léï4#÷¯Eñ	142 :»q_á¼&âV4ñX=*Ië(ºvÓh:p×Öim¥´?P«Ç9$¡)áéW«)m{8%þ))Múû¯ï?8¿fßï\|GáøNÓü) éºnô»N¾.×-¯ôýCGOê7zr¾§ccgaoÐÆím<×léï4#÷¯Eñ

143 ÿgg,«Nìç	143 ÿgg,«Nìç

144 OùÅyöðû,¢ClG	144 OùÅyöðû,¢ClG

145 ÔEHöª*aBªÂí	145 ÔEHöª*aBªÂí

146 8¯OÒ´ á@¬¤my\=ÿJýÏøs	146 8¯OÒ´ á@¬¤my\=ÿJýÏøs

147 ÃGÃÞS%:¹§$¶IiìvÛg¹Å\Þ¬jÕ´cM5-¢ûêÛz¶÷²ÙY.ºÇÄ2¸ùÔäzØÎ3éÏé[ñk³þN;ã çaÒ]pq×ÛÛÿÕZ)béÛ'×Ûükô*i+)4ì½ÿÙ	147 ÃGÃÞS%:¹§$¶IiìvÛg¹Å\Þ¬jÕ´cM5-¢ûêÛz¶÷²ÙY.ºÇÄ2¸ùÔäzØÎ3éÏé[ñk³þN;ã çaÒ]pq×ÛÛÿÕZ)béÛ'×Ûükô*i+)4ì½ÿÙ

OLD	NEW