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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/component_extension_resources.grd

Issue 10443024: Added chrome switch that lets tests override URL path, moved GAIA auth extension from CrOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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
« chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js ('K') | « chrome/browser/resources/chromeos/login/screen_gaia_signin.js ('k') | chrome/browser/resources/gaia_auth/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/component_extension_resources.grd
diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
index 1ddad13e3809c6e22b7718d4752b7ed85939b3b7..e6c0c61e8f4386174e4a239e90e054da19fbb578 100644
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -21,7 +21,18 @@
<include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_TREE_JS" file="bookmark_manager/js/bmm/bookmark_tree.js" type="BINDATA" />
<include name="IDR_BOOKMARK_MANAGER_BOOKMARK_BMM_JS" file="bookmark_manager/js/bmm.js" type="BINDATA" />
<include name="IDR_BOOKMARK_MANAGER_BOOKMARK_CSS_JS" file="bookmark_manager/css/bmm.css.js" type="BINDATA" />
-
+ <if expr="pp_ifdef('chromeos')">
+ <include name="IDR_GAIA_AUTH_MAIN" file="gaia_auth/main.html" allowexternalscript="true" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_MAIN_JS" file="gaia_auth/main.js" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_MAIN_CSS" file="gaia_auth/main.css" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_OFFLINE" file="gaia_auth/offline.html" allowexternalscript="true" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_OFFLINE_JS" file="gaia_auth/offline.js" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_OFFLINE_CSS" file="gaia_auth/offline.css" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_SUCCESS" file="gaia_auth/success.html" allowexternalscript="true" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_SUCCESS_JS" file="gaia_auth/success.js" type="BINDATA" />
+ <include name="IDR_GAIA_AUTH_UTIL_CSS" file="gaia_auth/util.js" type="BINDATA" />
xiyuan 2012/05/25 20:03:12 nit: IDR_GAIA_AUTH_UTIL_CSS -> IDR_GAIA_AUTH_UTIL_
zel 2012/05/25 20:13:46 Done.
+ <include name="IDR_GAIA_AUTH_TEST_CONTENT_CSS" file="gaia_auth/test/content.js" type="BINDATA" />
xiyuan 2012/05/25 20:03:12 nit: IDR_GAIA_AUTH_TEST_CONTENT_CSS -> IDR_GAIA_AU
zel 2012/05/25 20:13:46 Done.
+ </if>
<if expr="pp_ifdef('file_manager_extension')">
<include name="IDR_FILE_MANAGER_MAIN" file="file_manager/main.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_FILE_MANAGER_MAIN_JS" file="file_manager/js/main_scripts.js" flattenhtml="true" type="BINDATA" />
« chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.js ('K') | « chrome/browser/resources/chromeos/login/screen_gaia_signin.js ('k') | chrome/browser/resources/gaia_auth/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698