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

Index: chrome/browser/ssl/ssl_blocking_page.cc

diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc

index 9bdbc9cf49cc642960dc7d0a5730d46b82b21b94..00d0fec6cfca23b1963662eeffa02d4eea958296 100644

--- a/chrome/browser/ssl/ssl_blocking_page.cc

+++ b/chrome/browser/ssl/ssl_blocking_page.cc

@@ -25,6 +25,7 @@

#include "chrome/browser/renderer_preferences_util.h"

#include "chrome/browser/ssl/ssl_error_classification.h"

#include "chrome/browser/ssl/ssl_error_info.h"

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

#include "chrome/common/chrome_switches.h"

#include "chrome/grit/chromium_strings.h"

#include "chrome/grit/generated_resources.h"

@@ -38,6 +39,7 @@

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

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

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

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

#include "content/public/common/ssl_status.h"

#include "grit/browser_resources.h"

#include "net/base/hash_value.h"

@@ -598,7 +600,8 @@ void SSLBlockingPage::OverrideRendererPrefs(

content::RendererPreferences* prefs) {

Profile* profile = Profile::FromBrowserContext(

web_contents_->GetBrowserContext());

- renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);

+ renderer_preferences_util::UpdateFromSystemSettings(

+ prefs, profile, web_contents_);

}

void SSLBlockingPage::OnProceed() {