diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-03 13:42:47 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-05-15 10:27:51 +0000 |
| commit | 8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec (patch) | |
| tree | d29d987c4d7b173cf853279b79a51598f104b403 /chromium/components/resources | |
| parent | 830c9e163d31a9180fadca926b3e1d7dfffb5021 (diff) | |
| download | qtwebengine-chromium-8c5c43c7b138c9b4b0bf56d946e61d3bbc111bec.tar.gz | |
BASELINE: Update Chromium to 66.0.3359.156
Change-Id: I0c9831ad39911a086b6377b16f995ad75a51e441
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/components/resources')
| -rw-r--r-- | chromium/components/resources/BUILD.gn | 4 | ||||
| -rw-r--r-- | chromium/components/resources/dom_distiller_resources.grdp | 2 | ||||
| -rw-r--r-- | chromium/components/resources/security_interstitials_resources.grdp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/chromium/components/resources/BUILD.gn b/chromium/components/resources/BUILD.gn index af21090adf5..ad5cec8d455 100644 --- a/chromium/components/resources/BUILD.gn +++ b/chromium/components/resources/BUILD.gn @@ -19,8 +19,6 @@ group("resources") { grit("components_resources") { source = "components_resources.grd" - # TODO(hashimoto): Remove this line. - output_name = "components_resources_new" outputs = [ "grit/components_resources.h", "components_resources.pak", @@ -44,8 +42,6 @@ grit("components_resources") { grit("components_scaled_resources") { source = "components_scaled_resources.grd" - # TODO(hashimoto): Remove this line. - output_name = "components_scaled_resources_new" outputs = [ "grit/components_scaled_resources.h", "grit/components_scaled_resources_map.cc", diff --git a/chromium/components/resources/dom_distiller_resources.grdp b/chromium/components/resources/dom_distiller_resources.grdp index d340722c1cd..3c3cc1a1eeb 100644 --- a/chromium/components/resources/dom_distiller_resources.grdp +++ b/chromium/components/resources/dom_distiller_resources.grdp @@ -9,9 +9,7 @@ <include name="IDR_DISTILLER_CSS" file="../dom_distiller/core/css/distilledpage.css" type="BINDATA" /> <include name="IDR_DISTILLER_IOS_CSS" file="../dom_distiller/core/css/distilledpage_ios.css" type="BINDATA" /> <include name="IDR_DISTILLER_LOADING_IMAGE" file="../dom_distiller/core/images/dom_distiller_material_spinner.svg" type="BINDATA" /> - <include name="IDR_IS_DISTILLABLE_JS" file="../dom_distiller/core/javascript/is_distillable_trigger.js" type="BINDATA" /> <include name="IDR_EXTRACT_PAGE_FEATURES_JS" file="../dom_distiller/core/javascript/extract_features.js" type="BINDATA" /> - <include name="IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL" file="../dom_distiller/core/data/distillable_page_model.bin" type="BINDATA" /> <include name="IDR_DISTILLABLE_PAGE_SERIALIZED_MODEL_NEW" file="../dom_distiller/core/data/distillable_page_model_new.bin" type="BINDATA" /> <include name="IDR_LONG_PAGE_SERIALIZED_MODEL" file="../dom_distiller/core/data/long_page_model.bin" type="BINDATA" /> </grit-part> diff --git a/chromium/components/resources/security_interstitials_resources.grdp b/chromium/components/resources/security_interstitials_resources.grdp index 4d72526b941..1ca9152b042 100644 --- a/chromium/components/resources/security_interstitials_resources.grdp +++ b/chromium/components/resources/security_interstitials_resources.grdp @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <grit-part> + <include name="IDR_SECURITY_INTERSTITIAL_COMMON_CSS" file="../security_interstitials/core/common/resources/interstitial_common.css" type="BINDATA" /> + <include name="IDR_SECURITY_INTERSTITIAL_CORE_CSS" file="../security_interstitials/core/common/resources/interstitial_core.css" type="BINDATA" /> <include name="IDR_SECURITY_INTERSTITIAL_UI_HTML" file="../security_interstitials/core/browser/resources/list_of_interstitials.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SECURITY_INTERSTITIAL_HTML" file="../security_interstitials/core/browser/resources/interstitial_large.html" flattenhtml="true" type="BINDATA" /> <include name="IDR_SECURITY_INTERSTITIAL_QUIET_HTML" file="../security_interstitials/core/browser/resources/interstitial_webview_quiet.html" flattenhtml="true" type="BINDATA" /> |