chrome/browser/resources/chromeos/echo/manifest.json - Issue 12095109: Merge 180041

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/browser/resources/chromeos/echo/manifest.json

Issue 12095109: Merge 180041 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1364/src/

Patch Set: Created 7 years, 10 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

OLD	NEW
1 {	1 {

2 // chrome-extension://kddnkjkcjddckihglkfcickdhbmaodcn/	2 // chrome-extension://kddnkjkcjddckihglkfcickdhbmaodcn/

3 "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvO/P4dVdpUZlr+oT5s3ccPIOIxZl6fO ch+sqcQWsROKNf+mvKZURGnVts8ttHH4oRt2+LW3I2M5PrkW9Q6ZPkOX5ZQFFuD7ujPSaUn8+Br5lC5T tlXsNzp1r+962Qaa1d8zCocwF/IZ+9M5bt61LUJ6Obe8lw+NRnC6CS6DuiewIDAQAB",	3 "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvO/P4dVdpUZlr+oT5s3ccPIOIxZl6fO ch+sqcQWsROKNf+mvKZURGnVts8ttHH4oRt2+LW3I2M5PrkW9Q6ZPkOX5ZQFFuD7ujPSaUn8+Br5lC5T tlXsNzp1r+962Qaa1d8zCocwF/IZ+9M5bt61LUJ6Obe8lw+NRnC6CS6DuiewIDAQAB",

4 "name": "Chrome OS ECHO Extension",	4 "name": "Chrome OS ECHO Extension",

5 "version": "1.0.0",	5 "version": "1.0.0",

6 "description": "Chrome OS ECHO Extension",	6 "description": "Chrome OS ECHO Extension",

7 "manifest_version": 2,	7 "manifest_version": 2,

8 "content_security_policy": "default-src 'self'; connect-src 'self' https://chr omeos-registration.googleapis.com",	8 "content_security_policy": "default-src 'self'; connect-src 'self' https://chr omeos-registration.googleapis.com",

9 "permissions": [	9 "permissions": [

10 "cookies",	10 "cookies",

11 "echoPrivate",	11 "echoPrivate",

12 "experimental", // Needed for the infobar API.	12 "experimental", // Needed for the infobar API.

13 "https:///"	13 "https:///"

14 ],	14 ],

15 "icons": {	15 "icons": {

16 "16": "chrome16.png"	16 "16": "chrome16.png",

	17 "32": "chrome32.png"

17 },	18 },

18 "default_locale": "en",	19 "default_locale": "en",

19 "web_accessible_resources": [	20 "web_accessible_resources": [

20 "broker.html",	21 "broker.html",

21 "broker.js"	22 "broker.js"

22 ],	23 ],

23 "background": {	24 "background": {

24 "scripts": ["main.js"],	25 "scripts": ["main.js"],

25 "persistent": false	26 "persistent": false

26 }	27 }

27 }	28 }

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »