components/resources/dom_distiller_resources.grdp - Issue 901793002: Add support for providing an external file for extracting content.

Side by Side Diff: components/resources/dom_distiller_resources.grdp

Issue 901793002: Add support for providing an external file for extracting content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moved injection to constructor Created 5 years, 9 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 unified diff | Download patch

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2 <grit-part>	2 <grit-part>

3 <include name="IDR_ABOUT_DOM_DISTILLER_HTML" file="../dom_distiller/webui/reso urces/about_dom_distiller.html" flattenhtml="true" allowexternalscript="true" ty pe="BINDATA" />	3 <include name="IDR_ABOUT_DOM_DISTILLER_HTML" file="../dom_distiller/webui/reso urces/about_dom_distiller.html" flattenhtml="true" allowexternalscript="true" ty pe="BINDATA" />

4 <include name="IDR_ABOUT_DOM_DISTILLER_CSS" file="../dom_distiller/webui/resou rces/about_dom_distiller.css" type="BINDATA" />	4 <include name="IDR_ABOUT_DOM_DISTILLER_CSS" file="../dom_distiller/webui/resou rces/about_dom_distiller.css" type="BINDATA" />

5 <include name="IDR_ABOUT_DOM_DISTILLER_JS" file="../dom_distiller/webui/resour ces/about_dom_distiller.js" type="BINDATA" />	5 <include name="IDR_ABOUT_DOM_DISTILLER_JS" file="../dom_distiller/webui/resour ces/about_dom_distiller.js" type="BINDATA" />

6 <include name="IDR_DOM_DISTILLER_VIEWER_HTML" file="../dom_distiller/core/html /dom_distiller_viewer.html" type="BINDATA" />	6 <include name="IDR_DOM_DISTILLER_VIEWER_HTML" file="../dom_distiller/core/html /dom_distiller_viewer.html" type="BINDATA" />

7 <include name="IDR_DOM_DISTILLER_VIEWER_JS" file="../dom_distiller/core/javasc ript/dom_distiller_viewer.js" type="BINDATA" />	7 <include name="IDR_DOM_DISTILLER_VIEWER_JS" file="../dom_distiller/core/javasc ript/dom_distiller_viewer.js" type="BINDATA" />

8 <if expr="not is_ios">	8 <if expr="not is_ios">

9 <include name="IDR_DISTILLER_JS" file="../dom_distiller/core/javascript/domd istiller.js" flattenhtml="true" type="BINDATA" />	9 <include name="IDR_DISTILLER_JS" file="../../third_party/dom_distiller_js/pa ckage/js/domdistiller_wrapped.js" type="BINDATA" />
	noyau (Ping after 24h) 2015/03/11 14:30:59 I'm not for that change. This file needs iOS speci I'm not for that change. This file needs iOS specific changes that are going to be hard to maintain: now the ios file and the non ios file are in two different repositories. Instead I made a CL (https://codereview.chromium.org/995343002/) that merge the two files in one and uses grit <if> to do the right thing, diminishing the maintenance burden. cjhopman 2015/03/12 02:03:14 Yeah, we should definitely merge these into one fi Show quoted text On 2015/03/11 14:30:59, noyau wrote: > I'm not for that change. This file needs iOS specific changes that are going to > be hard to maintain: now the ios file and the non ios file are in two different > repositories. > > Instead I made a CL (https://codereview.chromium.org/995343002/) that merge the > two files in one and uses grit <if> to do the right thing, diminishing the > maintenance burden. Yeah, we should definitely merge these into one file. We would like to maintain this in the dom distiller repo because the file basically needs to stay in sync with the api exposed there (but doesn't need to change for chrome-side changes). noyau, are you particularly opposed to it being maintained in the other repo? my impression is that you mostly just don't want us to be maintaining two similar, but different, versions of it. If it's in the other repo, we would also need to support different platforms via javascript stuff rather than grit stuff. wdyt?
10 </if>	10 </if>

11 <if expr="is_ios">	11 <if expr="is_ios">

12 <include name="IDR_DISTILLER_JS" file="../dom_distiller/ios/javascript/domdi stiller.js" flattenhtml="true" type="BINDATA" />	12 <include name="IDR_DISTILLER_JS" file="../dom_distiller/ios/javascript/domdi stiller.js" flattenhtml="true" type="BINDATA" />

13 </if>	13 </if>

14 <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpag e.css" type="BINDATA" />	14 <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpag e.css" type="BINDATA" />

15 <include name="IDR_IS_DISTILLABLE_JS" file="../dom_distiller/core/javascript/i s_distillable_trigger.js" type="BINDATA" />	15 <include name="IDR_IS_DISTILLABLE_JS" file="../dom_distiller/core/javascript/i s_distillable_trigger.js" type="BINDATA" />

16 </grit-part>	16 </grit-part>

OLD	NEW

« components/dom_distiller/core/distiller_page.h ('K') | « components/dom_distiller/standalone/content_extractor_browsertest.cc ('k') | ios/chrome/DEPS » ('j') | no next file with comments »