diff options
author | raymes <raymes@chromium.org> | 2015-05-06 19:44:58 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-07 02:45:43 +0000 |
commit | be67c3d1a41734b948b91cb0b7d57a0ecb6ef389 (patch) | |
tree | 4d0ce02f05841f1b6b7c4c45eeadd4b95ebb8186 /components/printing | |
parent | 67314612a2fca488205d44b4d6911e2a29578539 (diff) | |
download | chromium_src-be67c3d1a41734b948b91cb0b7d57a0ecb6ef389.zip chromium_src-be67c3d1a41734b948b91cb0b7d57a0ecb6ef389.tar.gz chromium_src-be67c3d1a41734b948b91cb0b7d57a0ecb6ef389.tar.bz2 |
Remove the OOP PDF flag
This removes the flag for enabling OOP PDF since it is enabled by default and
the in process viewer no longer works anyway. The old in-process browser tests
have been removed. They are mostly replaced by pdf_extension_test.cc and they
are disabled anyway.
BUG=483870,436444
Review URL: https://codereview.chromium.org/1128453003
Cr-Commit-Position: refs/heads/master@{#328687}
Diffstat (limited to 'components/printing')
3 files changed, 1 insertions, 6 deletions
diff --git a/components/printing/renderer/print_web_view_helper.cc b/components/printing/renderer/print_web_view_helper.cc index cef7a95..97c0a96 100644 --- a/components/printing/renderer/print_web_view_helper.cc +++ b/components/printing/renderer/print_web_view_helper.cc @@ -904,8 +904,7 @@ void PrintWebViewHelper::OnPrintForPrintPreview( // the element with ID "pdf-viewer" if it isn't an iframe. blink::WebLocalFrame* plugin_frame = pdf_element.document().frame(); blink::WebElement plugin_element = pdf_element; - if (delegate_->IsOutOfProcessPdfEnabled() && - pdf_element.hasHTMLTagName("iframe")) { + if (pdf_element.hasHTMLTagName("iframe")) { plugin_frame = blink::WebLocalFrame::fromFrameOwnerElement(pdf_element); plugin_element = delegate_->GetPdfElement(plugin_frame); if (plugin_element.isNull()) { diff --git a/components/printing/renderer/print_web_view_helper.h b/components/printing/renderer/print_web_view_helper.h index a4eea7b..28bdf68 100644 --- a/components/printing/renderer/print_web_view_helper.h +++ b/components/printing/renderer/print_web_view_helper.h @@ -94,9 +94,6 @@ class PrintWebViewHelper // a pdf plugin element can't be extracted from the frame. virtual blink::WebElement GetPdfElement(blink::WebLocalFrame* frame) = 0; - // Used to know whether the content to print could be nested in an iframe. - virtual bool IsOutOfProcessPdfEnabled() = 0; - virtual bool IsPrintPreviewEnabled() = 0; // If true, the user can be asked to provide print settings. diff --git a/components/printing/test/print_test_content_renderer_client.cc b/components/printing/test/print_test_content_renderer_client.cc index 0e8f427..b5947ce 100644 --- a/components/printing/test/print_test_content_renderer_client.cc +++ b/components/printing/test/print_test_content_renderer_client.cc @@ -20,7 +20,6 @@ class PrintWebViewHelperDelegate : public PrintWebViewHelper::Delegate { blink::WebElement GetPdfElement(blink::WebLocalFrame* frame) override { return blink::WebElement(); } - bool IsOutOfProcessPdfEnabled() override { return false; } bool IsPrintPreviewEnabled() override { #if defined(ENABLE_PRINT_PREVIEW) return true; |