Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1041)

Issues Search
    My Issues | Starred     Open | Closed | All

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: Fix HostZOomMapBrowserTest. 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
« no previous file with comments | « chrome/browser/chrome_page_zoom.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | chrome/browser/renderer_preferences_util.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..2650103bdc790d6adcd380d2da37b69a25ab4ef7 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,6 +101,8 @@ void MergeSessionLoadPage::OverrideRendererPrefs(
content::RendererPreferences* prefs) {
Profile* profile = Profile::FromBrowserContext(
web_contents_->GetBrowserContext());
+ prefs->default_zoom_level =
+ ZoomController::FromWebContents(web_contents_)->GetDefaultZoomLevel();
renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);
}
« no previous file with comments | « chrome/browser/chrome_page_zoom.cc ('k') | chrome/browser/chromeos/login/ui/webui_login_view.cc » ('j') | chrome/browser/renderer_preferences_util.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698