chrome/browser/chromeos/login/signin/merge_session_load_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/chromeos/login/signin/merge_session_load_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: Remove obsolete access of ZoomController from WebUILoginView. 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

Index: chrome/browser/chromeos/login/signin/merge_session_load_page.cc

diff --git a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

index 33292fc5b9d3cb1d774e55deba011a512a47ef78..0f67d36b7e795757ffb201a2173ce3bb6d9bf829 100644

--- a/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

+++ b/chrome/browser/chromeos/login/signin/merge_session_load_page.cc

@@ -19,6 +19,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/extensions/extension_constants.h"

#include "chrome/common/url_constants.h"

#include "chrome/grit/browser_resources.h"

@@ -100,7 +101,8 @@ void MergeSessionLoadPage::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 MergeSessionLoadPage::OnProceed() {

« no previous file with comments | « chrome/browser/chrome_page_zoom.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | no next file with comments »