Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: chrome/browser/resources/gaia_auth/manifest_desktop.json

Issue 134263005: Implement inline signin with iframe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/gaia_auth/manifest_desktop.json
diff --git a/chrome/browser/resources/gaia_auth/manifest_inline.json b/chrome/browser/resources/gaia_auth/manifest_desktop.json
similarity index 53%
rename from chrome/browser/resources/gaia_auth/manifest_inline.json
rename to chrome/browser/resources/gaia_auth/manifest_desktop.json
index 2040360615fd4410b119bf9b3aafdf4b4b05ec31..698239ab0dcf824c2ac881226b167808e3326b05 100644
--- a/chrome/browser/resources/gaia_auth/manifest_inline.json
+++ b/chrome/browser/resources/gaia_auth/manifest_desktop.json
@@ -4,29 +4,29 @@
"name": "GaiaAuthExtension",
"version": "0.0.1",
"manifest_version": 2,
+ "background" : {
+ "scripts": ["background.js", "channel.js"]
+ },
+ "content_scripts": [
+ {
+ "matches": [
+ "<all_urls>"
+ ],
+ "js": ["channel.js", "desktop_injected.js"],
+ "all_frames": true
+ }
+ ],
"content_security_policy": "default-src 'self'; script-src 'self'; frame-src *; style-src 'self' 'unsafe-inline'",
"description": "GAIA Component Extension",
"web_accessible_resources": [
"main.css",
- "inline_main.html",
+ "main.html",
"main.js",
- "offline.css",
- "offline.html",
- "offline.js",
- "success.html",
- "success.js",
"util.js"
],
- // <all_urls> for intercepting all URL requests in the main frame, and
- // switching to a full tab if needed.
- // cookies for getting hash passed back from GAIA on login success.
- // tabs for calling current webui's login. This might not be needed once
- // we have extension API.
- // webview for interacting with the GAIA sign in page loaded in a webview.
"permissions": [
- "<all_urls>",
- "cookies",
- "tabs",
- "webview"
+ "<all_urls>",
+ "tabs",
+ "webRequest"
]
}

Powered by Google App Engine
This is Rietveld 408576698