chrome/test/data/extensions/api_test/notification/galore/app/images/fruit5-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/fruit5-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/fruit5-64x64.jpg ('k') | chrome/test/data/extensions/api_test/notification/galore/app/images/fruit6-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 ?þþ(¢(¢(¢(¢(¢(¢(¯øûûJü"ýü-?~)ø4¨Å£¦è¶6×§µÅÓR6-+I² Æù Ï)Ö9.#Y§85üø\|fÿþxîÓÇZÆð{á	10 ?þþ(¢(¢(¢(¢(¢(¢(¯øûûJü"ýü-?~)ø4¨Å£¦è¶6×§µÅÓR6-+I² Æù Ï)Ö9.#Y§85üø\|fÿþxîÓÇZÆð{á

(...skipping 78 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
89 ÁÐI d<á+fxãý{ÿw~ËÚçÆr0Õ´?³ü:¹Ô/¤äZÛÍ«é71ß]hð\Kíä¢ñ=óDa}ÉIdv	89 ÁÐI d<á+fxãý{ÿw~ËÚçÆr0Õ´?³ü:¹Ô/¤äZÛÍ«é71ß]hð\Kíä¢ñ=óDa}ÉIdv

90 þ·û9Á¾4x³YÑµïÚæûÃ^±[+¡ðëKºÓíu)o#ÚæêÎë[µ´óítye´H±Ìgt9F¶$ý	90 þ·û9Á¾4x³YÑµïÚæûÃ^±[+¡ðëKºÓíu)o#ÚæêÎë[µ´óítye´H±Ìgt9F¶$ý

91 ü3ø¤øEÓ4=>ËOÑ´*íì´½2Ú+[KXP	91 ü3ø¤øEÓ4=>ËOÑ´*íì´½2Ú+[KXP

92 E	92 E

93 "¢.âIÀ,IÉ&²á¾	93 "¢.âIÀ,IÉ&²á¾

94 ÆUÅÒÇf´¾« ïs´ªÔ»ñ·t¨«;A®fæµ®}G?IÌCá~Ì!f¢ä¯¤êG	94 ÆUÅÒÇf´¾« ïs´ªÔ»ñ·t¨«;A®fæµ®}G?IÌCá~Ì!f¢ä¯¤êG

95 ¢¯Ëì#ËJSÆÏÜu+Ç÷4Ü§íä1ðà~hÚüáý3Ãú	95 ¢¯Ëì#ËJSÆÏÜu+Ç÷4Ü§íä1ðà~hÚüáý3Ãú

96 ·c¤XÛX[ù0k¥[hÔKq$t6^G;d××QD¢¢¡@	96 ·c¤XÛX[ù0k¥[hÔKq$t6^G;d××QD¢¢¡@

97 ðÍRÓ´»]6%Ý0@ÁsÔöüh×ë±aÂQvKE÷yçn"µLMi×RUjÔm¹IÞM½[mêÛ}[	97 ðÍRÓ´»]6%Ý0@ÁsÔöüh×ë±aÂQvKE÷yçn"µLMi×RUjÔm¹IÞM½[mêÛ}[

98 (¢QEQEQEQEÿÙ	98 (¢QEQEQEQEÿÙ

OLD	NEW