| Index: components/dom_distiller/core/dom_distiller_request_view_base.cc
|
| diff --git a/components/dom_distiller/core/dom_distiller_request_view_base.cc b/components/dom_distiller/core/dom_distiller_request_view_base.cc
|
| index fe29a532d90222a7bfd126ae6ae40e585dd57a00..7dbc67db5853c4922e20ad173c49ec017f282e56 100644
|
| --- a/components/dom_distiller/core/dom_distiller_request_view_base.cc
|
| +++ b/components/dom_distiller/core/dom_distiller_request_view_base.cc
|
| @@ -32,7 +32,7 @@ DomDistillerRequestViewBase::~DomDistillerRequestViewBase() {
|
| void DomDistillerRequestViewBase::FlagAsErrorPage() {
|
| // Viewer handle is not passed to this in the case of error pages
|
| // so send all JavaScript now.
|
| - SendJavaScript(viewer::GetJavaScript());
|
| + SendCommonJavaScript();
|
| SendJavaScript(viewer::GetErrorPageJs());
|
|
|
| is_error_page_ = true;
|
| @@ -108,13 +108,23 @@ void DomDistillerRequestViewBase::OnChangeFontFamily(
|
| SendJavaScript(viewer::GetDistilledPageFontFamilyJs(new_font));
|
| }
|
|
|
| +void DomDistillerRequestViewBase::OnChangeFontScaling(float scaling) {
|
| + SendJavaScript(viewer::GetDistilledPageFontScalingJs(scaling));
|
| +}
|
| +
|
| void DomDistillerRequestViewBase::TakeViewerHandle(
|
| scoped_ptr<ViewerHandle> viewer_handle) {
|
| viewer_handle_ = viewer_handle.Pass();
|
| // Getting the viewer handle means this is not an error page, send
|
| // the viewer JavaScript and show the loading indicator.
|
| - SendJavaScript(viewer::GetJavaScript());
|
| + SendCommonJavaScript();
|
| SendJavaScript(viewer::GetToggleLoadingIndicatorJs(false));
|
| }
|
|
|
| +void DomDistillerRequestViewBase::SendCommonJavaScript() {
|
| + SendJavaScript(viewer::GetJavaScript());
|
| + SendJavaScript(viewer::GetDistilledPageFontScalingJs(
|
| + distilled_page_prefs_->GetFontScaling()));
|
| +}
|
| +
|
| } // namespace dom_distiller
|
|
|