chrome/browser/ui/pdf/pdf_unsupported_feature.cc - Issue 541103002: Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/pdf/pdf_unsupported_feature.cc

Issue 541103002: Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/profiles/profile_impl.cc ('K') | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/browser/ui/prefs/prefs_tab_helper.h » ('j') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/pdf/pdf_unsupported_feature.cc

diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc

index d3f791bc6939b4c64a07d6c9d46bc061478e9bad..a7320fe1a49f08282cbb6838abf088e0697c64a0 100644

--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc

+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc

@@ -14,6 +14,7 @@

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/renderer_preferences_util.h"

#include "chrome/browser/tab_contents/tab_util.h"

+#include "chrome/browser/ui/zoom/zoom_controller.h"

#include "chrome/common/chrome_content_client.h"

#include "chrome/grit/generated_resources.h"

#include "components/pdf/browser/open_pdf_in_reader_prompt_client.h"

@@ -28,6 +29,7 @@

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/user_metrics.h"

#include "content/public/browser/web_contents.h"

+#include "content/public/common/renderer_preferences.h"

#include "grit/browser_resources.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/resource/resource_bundle.h"

@@ -218,7 +220,8 @@ class PDFUnsupportedFeatureInterstitial

content::RendererPreferences* prefs) override {

Profile* profile =

Profile::FromBrowserContext(web_contents_->GetBrowserContext());

- renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);

+ renderer_preferences_util::UpdateFromSystemSettings(

+ prefs, profile, web_contents_);

}

private: