| commit | 762cc00892894be1b7e74015cd9bb22281a048eb | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Wed Oct 02 21:34:14 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Wed Oct 02 21:34:14 2013 |
| tree | 73f3913af84216bd6f52ce9a920341ab53eb975c | |
| parent | 8c216736e5ee34ff9b4efe1352c9439c02ce2c6f [diff] [blame] |
Inline sign in flow with gaia auth extension Design doc at https://docs.google.com/a/google.com/document/d/1L0gcqZEZ0lWL0PgqO6uPyecuxJdTvzZpps2zRly_wTg/edit#heading=h.5cwdwtkutcuo BUG=302037 Review URL: https://codereview.chromium.org/25347002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226569 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd index 28252791..0435551 100644 --- a/chrome/browser/browser_resources.grd +++ b/chrome/browser/browser_resources.grd
@@ -279,6 +279,7 @@ <include name="IDR_GAIA_AUTH_MANIFEST" file="resources\gaia_auth\manifest.json" type="BINDATA" /> <include name="IDR_GAIA_AUTH_KEYBOARD_MANIFEST" file="resources\gaia_auth\manifest_keyboard.json" type="BINDATA" /> <include name="IDR_GAIA_AUTH_SAML_MANIFEST" file="resources\gaia_auth\manifest_saml.json" type="BINDATA" /> + <include name="IDR_GAIA_AUTH_INLINE_MANIFEST" file="resources\gaia_auth\manifest_inline.json" type="BINDATA" /> <if expr="pp_ifdef('chromeos')"> <include name="IDR_ABOUT_SYS_HTML" file="resources\chromeos\about_sys.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_BACKLOADER_MANIFEST" file="resources\backloader\manifest.json" type="BINDATA" />