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

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

Issue 11293267: Put the pop-up app launcher behind a compile-time flag, and provide defines. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: unifdef controller from startup, lets us do nicer excludes Created 8 years, 1 month 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
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/resources/options/options.html » ('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 a8bf217d5c1a8a0964b7c218a1ab3292882ca35a..5b757d7420214d7237942930e3f8635795fd4f6d 100644
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -103,7 +103,7 @@
<include name="IDR_SCRIPT_BUBBLE_POPUP_HTML" file="script_bubble/popup.html" flattenhtml="false" type="BINDATA" />
<include name="IDR_SCRIPT_BUBBLE_POPUP_JS" file="script_bubble/popup.js" flattenhtml="false" type="BINDATA" />
<include name="IDR_SCRIPT_BUBBLE_POPUP_ICON" file="script_bubble/16.png" flattenhtml="false" type="BINDATA" />
- <if expr="is_win">
+ <if expr="pp_ifdef('enable_settings_app')">
<include name="IDR_SETTINGS_APP_JS" file="settings_app/settings_app.js" type="BINDATA" />
</if>
</includes>
« no previous file with comments | « chrome/browser/extensions/component_loader.cc ('k') | chrome/browser/resources/options/options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698