summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_resources.grd
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 01:29:42 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-18 01:29:42 +0000
commit4a42d27f346529b37f839b27b8b1dedd7e507002 (patch)
tree73c407a059acf1fc1252c64c201a5253135a28c2 /chrome/browser/browser_resources.grd
parent988506992537ed14bc02c00a2bae38088befcc0e (diff)
downloadchromium_src-4a42d27f346529b37f839b27b8b1dedd7e507002.zip
chromium_src-4a42d27f346529b37f839b27b8b1dedd7e507002.tar.gz
chromium_src-4a42d27f346529b37f839b27b8b1dedd7e507002.tar.bz2
Enable domui options for use in browser using the switch:
--enable-tabbed-options BUG=none TEST=see description Review URL: http://codereview.chromium.org/2820007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50191 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
-rw-r--r--chrome/browser/browser_resources.grd2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 330e0df..ef136af 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -43,8 +43,8 @@ without changes to the corresponding grd file. tiiittttrrr -->
<include name="IDR_MEDIAPLAYER_HTML" file="resources\mediaplayer.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_MEDIAPLAYERPLAYLIST_HTML" file="resources\playlist.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_ABOUT_SYS_HTML" file="resources\about_sys.html" flattenhtml="true" type="BINDATA" />
- <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenhtml="true" type="BINDATA" />
</if>
+ <include name="IDR_OPTIONS_HTML" file="resources\options.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_APP_GALLERY_ICON" file="resources\app_gallery_icon.png" type="BINDATA" />
<include name="IDR_BOOKMARKS_MANIFEST" file="resources\bookmark_manager\manifest.json" type="BINDATA" />
<include name="IDR_GMAIL_APP_MANIFEST" file="resources\gmail_app\manifest.json" type="BINDATA" />