Index: chrome/browser/resources/shared_resources.grd |
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd |
index 7d554fb967f6e4e2c8f999848ddc1312208590df..85decfd531b1663eaab5c82d47e63545e0c6e0c0 100644 |
--- a/chrome/browser/resources/shared_resources.grd |
+++ b/chrome/browser/resources/shared_resources.grd |
@@ -25,7 +25,7 @@ without changes to the corresponding grd file. --> |
<include name="IDR_SHARED_CSS_CHROME" |
file="shared/css/chrome_shared.css" type="BINDATA" /> |
<include name="IDR_SHARED_CSS_CHROME2" |
- file="shared/css/chrome_shared2.css" type="BINDATA" /> |
+ file="shared/css/chrome_shared2.css" type="BINDATA" flattenhtml="true" /> |
James Hawkins
2012/04/10 18:26:54
80 cols.
Denis Kuznetsov (DE-MUC)
2012/04/11 13:51:14
Done.
|
<include name="IDR_SHARED_CSS_CHROME2_TOUCH" |
file="shared/css/chrome_shared2_touch.css" type="BINDATA" |
flattenhtml="true" /> |
@@ -163,6 +163,12 @@ without changes to the corresponding grd file. --> |
file="shared/js/parse_html_subset.js" type="BINDATA" /> |
<include name="IDR_SHARED_JS_UTIL" |
file="shared/js/util.js" type="BINDATA" /> |
+ <if expr="pp_ifdef('chromeos')"> |
+ <include name="IDR_SHARED_CSS_UI_ACCOUNT_TWEAKS" |
+ file="shared/css/chromeos/ui_account_tweaks.css" type="BINDATA" /> |
James Hawkins
2012/04/10 18:26:54
80 cols.
Denis Kuznetsov (DE-MUC)
2012/04/11 13:51:14
Done.
|
+ <include name="IDR_SHARED_JS_UI_ACCOUNT_TWEAKS" |
+ file="shared/js/chromeos/ui_account_tweaks.js" type="BINDATA" /> |
James Hawkins
2012/04/10 18:26:54
80 cols.
Denis Kuznetsov (DE-MUC)
2012/04/11 13:51:14
Done.
|
+ </if> |
</includes> |
</release> |
</grit> |