summaryrefslogtreecommitdiffstats
path: root/components/resources/dom_distiller_resources.grdp
diff options
context:
space:
mode:
authorkuan <kuan@chromium.org>2014-09-25 09:23:07 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-25 16:23:34 +0000
commit3695ffef35abf39c0ea4b38ea4ccfca7764a109a (patch)
treed6f4692d46d7c67ed2c05dc837fa55482e25461d /components/resources/dom_distiller_resources.grdp
parenta82c0a5f1cc8519f5c9fdf20e65268fbc5929173 (diff)
downloadchromium_src-3695ffef35abf39c0ea4b38ea4ccfca7764a109a.zip
chromium_src-3695ffef35abf39c0ea4b38ea4ccfca7764a109a.tar.gz
chromium_src-3695ffef35abf39c0ea4b38ea4ccfca7764a109a.tar.bz2
display error message for empty distilled content
also: - ensure that error message is displayed for empty title - move dom_distiller_viewer.html/js from content to core dir - added tests. BUG=403066 Review URL: https://codereview.chromium.org/563923002 Cr-Commit-Position: refs/heads/master@{#296719}
Diffstat (limited to 'components/resources/dom_distiller_resources.grdp')
-rw-r--r--components/resources/dom_distiller_resources.grdp4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/resources/dom_distiller_resources.grdp b/components/resources/dom_distiller_resources.grdp
index 45b70c6..186bd5e 100644
--- a/components/resources/dom_distiller_resources.grdp
+++ b/components/resources/dom_distiller_resources.grdp
@@ -3,8 +3,8 @@
<include name="IDR_ABOUT_DOM_DISTILLER_HTML" file="../dom_distiller/webui/resources/about_dom_distiller.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_ABOUT_DOM_DISTILLER_CSS" file="../dom_distiller/webui/resources/about_dom_distiller.css" type="BINDATA" />
<include name="IDR_ABOUT_DOM_DISTILLER_JS" file="../dom_distiller/webui/resources/about_dom_distiller.js" type="BINDATA" />
- <include name="IDR_DOM_DISTILLER_VIEWER_HTML" file="../dom_distiller/content/resources/dom_distiller_viewer.html" type="BINDATA" />
- <include name="IDR_DOM_DISTILLER_VIEWER_JS" file="../dom_distiller/content/resources/dom_distiller_viewer.js" type="BINDATA" />
+ <include name="IDR_DOM_DISTILLER_VIEWER_HTML" file="../dom_distiller/core/html/dom_distiller_viewer.html" type="BINDATA" />
+ <include name="IDR_DOM_DISTILLER_VIEWER_JS" file="../dom_distiller/core/javascript/dom_distiller_viewer.js" type="BINDATA" />
<include name="IDR_DISTILLER_JS" file="../dom_distiller/core/javascript/domdistiller.js" flattenhtml="true" type="BINDATA" />
<include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpage.css" type="BINDATA" />
<include name="IDR_IS_DISTILLABLE_JS" file="../dom_distiller/core/javascript/is_distillable_trigger.js" type="BINDATA" />