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

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

Issue 10006028: Plugins page in BWSI session has unnecessary and misleading UI components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit fix Created 8 years, 8 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/shared_resources.grd
diff --git a/chrome/browser/resources/shared_resources.grd b/chrome/browser/resources/shared_resources.grd
index 7d554fb967f6e4e2c8f999848ddc1312208590df..648805403faa1fac99ac81d5e22248e3da11d3ce 100644
--- a/chrome/browser/resources/shared_resources.grd
+++ b/chrome/browser/resources/shared_resources.grd
@@ -25,7 +25,8 @@ 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" />
<include name="IDR_SHARED_CSS_CHROME2_TOUCH"
file="shared/css/chrome_shared2_touch.css" type="BINDATA"
flattenhtml="true" />
@@ -163,6 +164,14 @@ 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" />
+ <include name="IDR_SHARED_JS_UI_ACCOUNT_TWEAKS"
+ file="shared/js/chromeos/ui_account_tweaks.js"
+ type="BINDATA" />
+ </if>
</includes>
</release>
</grit>
« no previous file with comments | « chrome/browser/resources/shared/js/chromeos/ui_account_tweaks.js ('k') | chrome/browser/ui/webui/chromeos/ui_account_tweaks.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698