Introduce ChromeZoomLevelPref, make zoom level prefs independent of profile prefs.

chrome/browser/renderer_preferences_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_preferences_util.h"
 
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/host_zoom_map.h"
 #include "content/public/common/renderer_preferences.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
 #include "ui/gfx/font_render_params.h"
 #endif
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/views/controls/textfield/textfield.h"
 #endif
 
 #if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "ui/views/linux_ui/linux_ui.h"
 #endif
 
 namespace renderer_preferences_util {
 
-void UpdateFromSystemSettings(
-    content::RendererPreferences* prefs, Profile* profile) {
+void UpdateFromSystemSettings(content::RendererPreferences* prefs,
+                              Profile* profile,
+                              content::WebContents* web_contents) {
   const PrefService* pref_service = profile->GetPrefs();
   prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages);
   prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers);
   prefs->enable_do_not_track =
       pref_service->GetBoolean(prefs::kEnableDoNotTrack);
-  prefs->default_zoom_level = pref_service->GetDouble(prefs::kDefaultZoomLevel);
+  ZoomController* zoom_controller =
+      ZoomController::FromWebContents(web_contents);
+  if (zoom_controller) {
+    prefs->default_zoom_level = zoom_controller->GetDefaultZoomLevel();
+  } else {
+    prefs->default_zoom_level =
+        content::HostZoomMap::GetDefaultForBrowserContext(
+            web_contents->GetBrowserContext())->GetDefaultZoomLevel();
+  }
 
 #if defined(USE_DEFAULT_RENDER_THEME)
   prefs->focus_ring_color = SkColorSetRGB(0x4D, 0x90, 0xFE);
 #if defined(OS_CHROMEOS)
   // This color is 0x544d90fe modulated with 0xffffff.
   prefs->active_selection_bg_color = SkColorSetRGB(0xCB, 0xE4, 0xFA);
   prefs->active_selection_fg_color = SK_ColorBLACK;
   prefs->inactive_selection_bg_color = SkColorSetRGB(0xEA, 0xEA, 0xEA);
   prefs->inactive_selection_fg_color = SK_ColorBLACK;
 #endif
@@ skipping 36 matching lines @@
   prefs->subpixel_rendering = params.subpixel_rendering;
 #endif
 
 #if !defined(OS_MACOSX)
   prefs->plugin_fullscreen_allowed =
       pref_service->GetBoolean(prefs::kFullscreenAllowed);
 #endif
 }
 
 }  // namespace renderer_preferences_util