chrome/browser/safe_browsing/safe_browsing_blocking_page.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/safe_browsing/safe_browsing_blocking_page.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, 3 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/renderer_preferences_util.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | chrome/browser/ui/prefs/prefs_tab_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

index b859f7343d24e682fb2807aaf19a8e5772a9faf5..1e7d2c9ae289d2641158f2db67cb0b5bff845756 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc

@@ -35,10 +35,12 @@

#include "chrome/grit/locale_settings.h"

#include "components/google/core/browser/google_util.h"

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

+#include "content/public/browser/host_zoom_map.h"

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

#include "content/public/browser/navigation_controller.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 "net/base/escape.h"

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

@@ -448,6 +450,10 @@ void SafeBrowsingBlockingPage::OverrideRendererPrefs(

Profile* profile = Profile::FromBrowserContext(

web_contents_->GetBrowserContext());

renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);

+ // TODO(wjmaclean): Convert this to use the HostZoomMap for the WebContents

+ // when HostZoomMap moves to StoragePartition.

+ prefs->default_zoom_level = content::HostZoomMap::GetDefaultForBrowserContext(

+ profile)->GetDefaultZoomLevel();

}

void SafeBrowsingBlockingPage::SetReportingPreference(bool report) {