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

Unified Diff: chrome/browser/renderer_preferences_util.cc

Issue 1804023002: Fix page zoom to be frame-centric for out-of-process frames. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove 'anonymous'. Created 4 years, 8 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/renderer_preferences_util.cc
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index 2fff3f3f1620ba98de054cedb95d3347a120ceaf..1a1a910a0b300ae00e0d8a30c1cd8973bf31bd8f 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -9,7 +9,6 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
-#include "content/public/browser/host_zoom_map.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/renderer_preferences.h"
#include "content/public/common/webrtc_ip_handling_policy.h"
@@ -19,10 +18,6 @@
#include "ui/gfx/font_render_params.h"
#endif
-#if !defined(OS_ANDROID)
-#include "components/ui/zoom/zoom_controller.h"
-#endif
-
#if defined(TOOLKIT_VIEWS)
#include "ui/views/controls/textfield/textfield.h"
#endif
@@ -62,24 +57,6 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
}
#endif
- double default_zoom_level = 0;
- bool default_zoom_level_set = false;
-#if !defined(OS_ANDROID)
- ui_zoom::ZoomController* zoom_controller =
- ui_zoom::ZoomController::FromWebContents(web_contents);
- if (zoom_controller) {
- default_zoom_level = zoom_controller->GetDefaultZoomLevel();
- default_zoom_level_set = true;
- }
-#endif
-
- if (!default_zoom_level_set) {
- default_zoom_level =
- content::HostZoomMap::Get(web_contents->GetSiteInstance())
- ->GetDefaultZoomLevel();
- }
- prefs->default_zoom_level = default_zoom_level;
-
#if defined(USE_DEFAULT_RENDER_THEME)
prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE);
#if defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698