summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 11:20:44 +0000
committerraymes@chromium.org <raymes@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-29 11:20:44 +0000
commitfa0328832c77dc07845a3310106c41afa11afad3 (patch)
tree37f58d4868d0854c318e182ef11e42424111e121 /chrome/browser
parente933410fc77c0963299c858dce795a6f740da0e7 (diff)
downloadchromium_src-fa0328832c77dc07845a3310106c41afa11afad3.zip
chromium_src-fa0328832c77dc07845a3310106c41afa11afad3.tar.gz
chromium_src-fa0328832c77dc07845a3310106c41afa11afad3.tar.bz2
Remove PDF extension dependencies from grd files
This removes unnecessary PDF dependencies from component_extension_resources.grd and browser_resources.grd. These particular files get flattened into the HTML and so are not needed in the grd files. BUG=363909 Review URL: https://codereview.chromium.org/251813008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_resources.grd2
-rw-r--r--chrome/browser/resources/component_extension_resources.grd21
-rw-r--r--chrome/browser/resources/print_preview/previewarea/preview_area.js2
-rw-r--r--chrome/browser/resources/print_preview/print_preview.js1
4 files changed, 1 insertions, 25 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 4e2fd43..f5495f4 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -240,8 +240,6 @@
<include name="IDR_PRINT_PREVIEW_HTML" file="resources\print_preview\print_preview.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
<include name="IDR_PRINT_PREVIEW_PAGE" file="resources\print_preview\print_preview_page.html" flattenhtml="true" allowexternalscript="false" type="BINDATA" />
<include name="IDR_PRINT_PREVIEW_JS" file="resources\print_preview\print_preview.js" flattenhtml="true" type="BINDATA" />
- <include name="IDR_PRINT_PREVIEW_AREA_JS" file="resources\print_preview\previewarea\preview_area.js" flattenhtml="true" type="BINDATA" />
- <include name="IDR_PRINT_PDF_SCRIPTING_API_JS" file="resources\pdf\pdf_scripting_api.js" type="BINDATA" />
<include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER"
file="resources\print_preview\images\printer.png" type="BINDATA" />
<include name="IDR_PRINT_PREVIEW_IMAGES_PRINTER_SHARED"
diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd
index 09c237d..b289b9b 100644
--- a/chrome/browser/resources/component_extension_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -110,30 +110,9 @@
</if>
<if expr="enable_plugins">
<include name="IDR_PDF_INDEX_HTML" file="pdf/index.html" allowexternalscript="true" type="BINDATA" flattenhtml="true" />
- <include name="IDR_PDF_INDEX_CSS" file="pdf/index.css" allowexternalscript="true" type="BINDATA" />
<include name="IDR_PDF_JS" file="pdf/pdf.js" type="BINDATA" flattenhtml="true" />
- <include name="IDR_PDF_VIEWPORT_JS" file="pdf/viewport.js" type="BINDATA" />
<include name="IDR_PDF_BACKGROUND_JS" file="pdf/background.js" type="BINDATA" />
- <include name="IDR_PDF_SCRIPTING_API_JS" file="pdf/pdf_scripting_api.js" type="BINDATA" />
-
- <!-- Polymer libs. -->
- <include name="IDR_PDF_PLATFORM_JS" file="../../../third_party/polymer/platform/platform.js" type="BINDATA" />
- <include name="IDR_PDF_POLYMER_JS" file="../../../third_party/polymer/polymer/polymer.js" type="BINDATA" />
-
- <!-- Polymer elements. -->
<include name="IDR_PDF_INCLUDES_JS" file="pdf/includes.js" type="BINDATA" flattenhtml="true" />
- <include name="IDR_PDF_BUTTON_HTML" file="pdf/html_office/elements/viewer-button/viewer-button.html" type="BINDATA" />
- <include name="IDR_PDF_BUTTON_JS" file="pdf/html_office/elements/viewer-button/viewer-button.js" type="BINDATA" />
- <include name="IDR_PDF_ERROR_SCREEN_HTML" file="pdf/html_office/elements/viewer-error-screen/viewer-error-screen.html" type="BINDATA" />
- <include name="IDR_PDF_ERROR_SCREEN_JS" file="pdf/html_office/elements/viewer-error-screen/viewer-error-screen.js" type="BINDATA" />
- <include name="IDR_PDF_PAGE_INDICATOR_HTML" file="pdf/html_office/elements/viewer-page-indicator/viewer-page-indicator.html" type="BINDATA" />
- <include name="IDR_PDF_PAGE_INDICATOR_JS" file="pdf/html_office/elements/viewer-page-indicator/viewer-page-indicator.js" type="BINDATA" />
- <include name="IDR_PDF_PASSWORD_SCREEN_HTML" file="pdf/html_office/elements/viewer-password-screen/viewer-password-screen.html" type="BINDATA" />
- <include name="IDR_PDF_PASSWORD_SCREEN_JS" file="pdf/html_office/elements/viewer-password-screen/viewer-password-screen.js" type="BINDATA" />
- <include name="IDR_PDF_PROGRESS_BAR_HTML" file="pdf/html_office/elements/viewer-progress-bar/viewer-progress-bar.html" type="BINDATA" />
- <include name="IDR_PDF_PROGRESS_BAR_JS" file="pdf/html_office/elements/viewer-progress-bar/viewer-progress-bar.js" type="BINDATA" />
- <include name="IDR_PDF_TOOLBAR_HTML" file="pdf/html_office/elements/viewer-toolbar/viewer-toolbar.html" type="BINDATA" />
- <include name="IDR_PDF_TOOLBAR_JS" file="pdf/html_office/elements/viewer-toolbar/viewer-toolbar.js" type="BINDATA" />
<!-- Button images. -->
<include name="IDR_PDF_BUTTON_LOW_1" file="pdf/html_office/elements/viewer-button/img/lowDPI/button_fit_page.png" type="BINDATA" />
diff --git a/chrome/browser/resources/print_preview/previewarea/preview_area.js b/chrome/browser/resources/print_preview/previewarea/preview_area.js
index 0ce7615..ec764e7 100644
--- a/chrome/browser/resources/print_preview/previewarea/preview_area.js
+++ b/chrome/browser/resources/print_preview/previewarea/preview_area.js
@@ -5,8 +5,6 @@
cr.define('print_preview', function() {
'use strict';
-<include src="../../pdf/pdf_scripting_api.js" />
-
/**
* Creates a PreviewArea object. It represents the area where the preview
* document is displayed.
diff --git a/chrome/browser/resources/print_preview/print_preview.js b/chrome/browser/resources/print_preview/print_preview.js
index 712e5cc..3d5c422 100644
--- a/chrome/browser/resources/print_preview/print_preview.js
+++ b/chrome/browser/resources/print_preview/print_preview.js
@@ -1012,6 +1012,7 @@ cr.define('print_preview', function() {
<include src="previewarea/margin_control.js"/>
<include src="previewarea/margin_control_container.js"/>
+<include src="../pdf/pdf_scripting_api.js" />
<include src="previewarea/preview_area.js"/>
<include src="preview_generator.js"/>