summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_resources.grd
diff options
context:
space:
mode:
authorrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-05 06:17:22 +0000
committerrkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-05 06:17:22 +0000
commit8ad8fe32cee582347784e6260aba1c8e141e9922 (patch)
tree41bdd16580f4ac17fcd3962c93c999492275c454 /chrome/browser/browser_resources.grd
parentefd6fb037b8e0ed31a62f4fcb5aaf8eb20aa7560 (diff)
downloadchromium_src-8ad8fe32cee582347784e6260aba1c8e141e9922.zip
chromium_src-8ad8fe32cee582347784e6260aba1c8e141e9922.tar.gz
chromium_src-8ad8fe32cee582347784e6260aba1c8e141e9922.tar.bz2
Implement Feedback UI using the feedbackPrivate API.
This CL implements the new feedback UI which is a component app built on the feedbackPrivate API. Owner reviews requested, estade@ chrome/browser/ui/webui/ content/browser/webui/ ui/webui/ asargent@ chrome/common/extensions/ chrome/browser/extensions/ jamescook@ chrome/browser/ui/ash/ battre@ chrome/browser/profile_resetter/ jhawkins@ chrome/browser/browser_resources.grd R=hirono@chromium.org, zork@chromium.org BUG=253686 TEST=Launch the UI, test sending various reports. Review URL: https://chromiumcodereview.appspot.com/20565006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215568 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_resources.grd')
-rw-r--r--chrome/browser/browser_resources.grd4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index c4e6269..7fb7013 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -117,6 +117,7 @@
<include name="IDR_EXTENSION_INFO_JS" file="resources\extensions\extension_info.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_EXTENSIONS_JS" file="resources\extensions\extensions.js" flattenhtml="true" type="BINDATA" />
</if>
+ <include name="IDR_FEEDBACK_MANIFEST" file="resources\feedback\manifest.json" type="BINDATA" />
<include name="IDR_FLAGS_HTML" file="resources\flags.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_FLAGS_JS" file="resources\flags.js" type="BINDATA" />
<include name="IDR_HELP_JS" file="resources\help\help.js" flattenhtml="true" type="BINDATA" />
@@ -242,9 +243,6 @@
<include name="IDR_SUGGESTIONS_PAGE_JS" file="resources\ntp4\suggestions_page.js" type="BINDATA" />
</if>
<include name="IDR_TRANSLATE_JS" file="resources\translate.js" type="BINDATA" />
- <include name="IDR_FEEDBACK_HTML" file="resources\feedback.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
- <include name="IDR_FEEDBACK_HTML_INVALID" file="resources\feedback_invalid.html" allowexternalscript="true" flattenhtml="true" type="BINDATA" />
- <include name="IDR_FEEDBACK_JS" file="resources\feedback.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_UBER_HTML" file="resources\uber\uber.html" flattenhtml="true" type="BINDATA" />
<include name="IDR_UBER_JS" file="resources\uber\uber.js" type="BINDATA" />
<include name="IDR_UBER_FRAME_HTML" file="resources\uber\uber_frame.html" flattenhtml="true" type="BINDATA" />